Enable release builds using the --without-logging option to the configure
script. Also a couple log message cleanups, plus some C to C++ comment conversion.
This commit is contained in:
parent
4fb45c4783
commit
74d314558c
3 changed files with 127 additions and 115 deletions
|
@ -24,6 +24,11 @@
|
||||||
#ifndef _LOGSTREAM_H
|
#ifndef _LOGSTREAM_H
|
||||||
#define _LOGSTREAM_H
|
#define _LOGSTREAM_H
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "Include/compiler.h"
|
#include "Include/compiler.h"
|
||||||
|
|
||||||
#ifdef FG_HAVE_STD_INCLUDES
|
#ifdef FG_HAVE_STD_INCLUDES
|
||||||
|
@ -190,6 +195,11 @@ fglog()
|
||||||
#endif // _LOGSTREAM_H
|
#endif // _LOGSTREAM_H
|
||||||
|
|
||||||
// $Log$
|
// $Log$
|
||||||
|
// Revision 1.2 1998/11/07 19:07:02 curt
|
||||||
|
// Enable release builds using the --without-logging option to the configure
|
||||||
|
// script. Also a couple log message cleanups, plus some C to C++ comment
|
||||||
|
// conversion.
|
||||||
|
//
|
||||||
// Revision 1.1 1998/11/06 21:20:42 curt
|
// Revision 1.1 1998/11/06 21:20:42 curt
|
||||||
// Initial revision.
|
// Initial revision.
|
||||||
//
|
//
|
||||||
|
|
140
Math/fg_random.c
140
Math/fg_random.c
|
@ -1,27 +1,25 @@
|
||||||
/**************************************************************************
|
// fg_random.c -- routines to handle random number generation
|
||||||
* fg_random.c -- routines to handle random number generation
|
//
|
||||||
*
|
// Written by Curtis Olson, started July 1997.
|
||||||
* Written by Curtis Olson, started July 1997.
|
//
|
||||||
*
|
// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
|
||||||
* Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
|
//
|
||||||
*
|
// This program is free software; you can redistribute it and/or
|
||||||
* This program is free software; you can redistribute it and/or
|
// modify it under the terms of the GNU General Public License as
|
||||||
* modify it under the terms of the GNU General Public License as
|
// published by the Free Software Foundation; either version 2 of the
|
||||||
* published by the Free Software Foundation; either version 2 of the
|
// License, or (at your option) any later version.
|
||||||
* License, or (at your option) any later version.
|
//
|
||||||
*
|
// This program is distributed in the hope that it will be useful, but
|
||||||
* This program is distributed in the hope that it will be useful, but
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
// General Public License for more details.
|
||||||
* General Public License for more details.
|
//
|
||||||
*
|
// You should have received a copy of the GNU General Public License
|
||||||
* You should have received a copy of the GNU General Public License
|
// along with this program; if not, write to the Free Software
|
||||||
* along with this program; if not, write to the Free Software
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
//
|
||||||
*
|
// $Id$
|
||||||
* $Id$
|
// (Log is kept at end of this file)
|
||||||
* (Log is kept at end of this file)
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -29,10 +27,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h> /* for random(), srandom() */
|
#include <stdlib.h> // for random(), srandom()
|
||||||
#include <time.h> /* for time() to seed srandom() */
|
#include <time.h> // for time() to seed srandom()
|
||||||
|
|
||||||
/* #include <Debug/fg_debug.h> */
|
|
||||||
|
|
||||||
#include "fg_random.h"
|
#include "fg_random.h"
|
||||||
|
|
||||||
|
@ -51,10 +47,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Seed the random number generater with time() so we don't see the
|
// Seed the random number generater with time() so we don't see the
|
||||||
* same sequence every time */
|
// same sequence every time
|
||||||
void fg_srandom(void) {
|
void fg_srandom(void) {
|
||||||
/* fgPrintf( FG_MATH, FG_INFO, "Seeding random number generater\n"); */
|
// fgPrintf( FG_MATH, FG_INFO, "Seeding random number generater\n");
|
||||||
|
|
||||||
#ifdef HAVE_RAND
|
#ifdef HAVE_RAND
|
||||||
srand(time(NULL));
|
srand(time(NULL));
|
||||||
|
@ -64,7 +60,7 @@ void fg_srandom(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* return a random number between [0.0, 1.0) */
|
// return a random number between [0.0, 1.0)
|
||||||
double fg_random(void) {
|
double fg_random(void) {
|
||||||
#ifdef HAVE_RAND
|
#ifdef HAVE_RAND
|
||||||
return(rand() / (double)RAND_MAX);
|
return(rand() / (double)RAND_MAX);
|
||||||
|
@ -74,41 +70,45 @@ double fg_random(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* $Log$
|
// $Log$
|
||||||
/* Revision 1.9 1998/11/06 21:17:26 curt
|
// Revision 1.10 1998/11/07 19:07:03 curt
|
||||||
/* Converted to new logstream debugging facility. This allows release
|
// Enable release builds using the --without-logging option to the configure
|
||||||
/* builds with no messages at all (and no performance impact) by using
|
// script. Also a couple log message cleanups, plus some C to C++ comment
|
||||||
/* the -DFG_NDEBUG flag.
|
// conversion.
|
||||||
/*
|
//
|
||||||
* Revision 1.8 1998/04/25 22:06:23 curt
|
// Revision 1.9 1998/11/06 21:17:26 curt
|
||||||
* Edited cvs log messages in source files ... bad bad bad!
|
// Converted to new logstream debugging facility. This allows release
|
||||||
*
|
// builds with no messages at all (and no performance impact) by using
|
||||||
* Revision 1.7 1998/04/24 00:43:13 curt
|
// the -DFG_NDEBUG flag.
|
||||||
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
//
|
||||||
*
|
// Revision 1.8 1998/04/25 22:06:23 curt
|
||||||
* Revision 1.6 1998/04/18 03:53:42 curt
|
// Edited cvs log messages in source files ... bad bad bad!
|
||||||
* Miscellaneous Tweaks.
|
//
|
||||||
*
|
// Revision 1.7 1998/04/24 00:43:13 curt
|
||||||
* Revision 1.5 1998/04/03 22:10:29 curt
|
// Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
||||||
* Converting to Gnu autoconf system.
|
//
|
||||||
*
|
// Revision 1.6 1998/04/18 03:53:42 curt
|
||||||
* Revision 1.4 1998/02/03 23:20:28 curt
|
// Miscellaneous Tweaks.
|
||||||
* Lots of little tweaks to fix various consistency problems discovered by
|
//
|
||||||
* Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
|
// Revision 1.5 1998/04/03 22:10:29 curt
|
||||||
* passed arguments along to the real printf(). Also incorporated HUD changes
|
// Converting to Gnu autoconf system.
|
||||||
* by Michele America.
|
//
|
||||||
*
|
// Revision 1.4 1998/02/03 23:20:28 curt
|
||||||
* Revision 1.3 1998/01/27 00:47:59 curt
|
// Lots of little tweaks to fix various consistency problems discovered by
|
||||||
* Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message
|
// Solaris' CC. Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
|
||||||
* system and commandline/config file processing code.
|
// passed arguments along to the real printf(). Also incorporated HUD changes
|
||||||
*
|
// by Michele America.
|
||||||
* Revision 1.2 1997/12/30 20:47:48 curt
|
//
|
||||||
* Integrated new event manager with subsystem initializations.
|
// Revision 1.3 1998/01/27 00:47:59 curt
|
||||||
*
|
// Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message
|
||||||
* Revision 1.1 1997/07/30 16:04:09 curt
|
// system and commandline/config file processing code.
|
||||||
* Moved random routines from Utils/ to Math/
|
//
|
||||||
*
|
// Revision 1.2 1997/12/30 20:47:48 curt
|
||||||
* Revision 1.1 1997/07/19 22:31:57 curt
|
// Integrated new event manager with subsystem initializations.
|
||||||
* Initial revision.
|
//
|
||||||
*
|
// Revision 1.1 1997/07/30 16:04:09 curt
|
||||||
*/
|
// Moved random routines from Utils/ to Math/
|
||||||
|
//
|
||||||
|
// Revision 1.1 1997/07/19 22:31:57 curt
|
||||||
|
// Initial revision.
|
||||||
|
//
|
||||||
|
|
|
@ -1,27 +1,25 @@
|
||||||
/**************************************************************************
|
// fg_random.h -- routines to handle random number generation
|
||||||
* fg_random.h -- routines to handle random number generation
|
//
|
||||||
*
|
// Written by Curtis Olson, started July 1997.
|
||||||
* Written by Curtis Olson, started July 1997.
|
//
|
||||||
*
|
// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
|
||||||
* Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
|
//
|
||||||
*
|
// This program is free software; you can redistribute it and/or
|
||||||
* This program is free software; you can redistribute it and/or
|
// modify it under the terms of the GNU General Public License as
|
||||||
* modify it under the terms of the GNU General Public License as
|
// published by the Free Software Foundation; either version 2 of the
|
||||||
* published by the Free Software Foundation; either version 2 of the
|
// License, or (at your option) any later version.
|
||||||
* License, or (at your option) any later version.
|
//
|
||||||
*
|
// This program is distributed in the hope that it will be useful, but
|
||||||
* This program is distributed in the hope that it will be useful, but
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
// General Public License for more details.
|
||||||
* General Public License for more details.
|
//
|
||||||
*
|
// You should have received a copy of the GNU General Public License
|
||||||
* You should have received a copy of the GNU General Public License
|
// along with this program; if not, write to the Free Software
|
||||||
* along with this program; if not, write to the Free Software
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
//
|
||||||
*
|
// $Id$
|
||||||
* $Id$
|
// (Log is kept at end of this file)
|
||||||
* (Log is kept at end of this file)
|
|
||||||
**************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _FG_RANDOM_H
|
#ifndef _FG_RANDOM_H
|
||||||
|
@ -33,11 +31,11 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Seed the random number generater with time() so we don't see the
|
// Seed the random number generater with time() so we don't see the
|
||||||
* same sequence every time */
|
// same sequence every time
|
||||||
void fg_srandom(void);
|
void fg_srandom(void);
|
||||||
|
|
||||||
/* return a random number between [0.0, 1.0) */
|
// return a random number between [0.0, 1.0)
|
||||||
double fg_random(void);
|
double fg_random(void);
|
||||||
|
|
||||||
|
|
||||||
|
@ -46,23 +44,27 @@ double fg_random(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#endif /* _FG_RANDOM_H */
|
#endif // _FG_RANDOM_H
|
||||||
|
|
||||||
|
|
||||||
/* $Log$
|
// $Log$
|
||||||
/* Revision 1.3 1998/04/21 17:03:48 curt
|
// Revision 1.4 1998/11/07 19:07:04 curt
|
||||||
/* Prepairing for C++ integration.
|
// Enable release builds using the --without-logging option to the configure
|
||||||
/*
|
// script. Also a couple log message cleanups, plus some C to C++ comment
|
||||||
* Revision 1.2 1998/01/22 02:59:38 curt
|
// conversion.
|
||||||
* Changed #ifdef FILE_H to #ifdef _FILE_H
|
//
|
||||||
*
|
// Revision 1.3 1998/04/21 17:03:48 curt
|
||||||
* Revision 1.1 1997/07/30 16:04:09 curt
|
// Prepairing for C++ integration.
|
||||||
* Moved random routines from Utils/ to Math/
|
//
|
||||||
*
|
// Revision 1.2 1998/01/22 02:59:38 curt
|
||||||
* Revision 1.2 1997/07/23 21:52:28 curt
|
// Changed #ifdef FILE_H to #ifdef _FILE_H
|
||||||
* Put comments around the text after an #endif for increased portability.
|
//
|
||||||
*
|
// Revision 1.1 1997/07/30 16:04:09 curt
|
||||||
* Revision 1.1 1997/07/19 22:31:57 curt
|
// Moved random routines from Utils/ to Math/
|
||||||
* Initial revision.
|
//
|
||||||
*
|
// Revision 1.2 1997/07/23 21:52:28 curt
|
||||||
*/
|
// Put comments around the text after an #endif for increased portability.
|
||||||
|
//
|
||||||
|
// Revision 1.1 1997/07/19 22:31:57 curt
|
||||||
|
// Initial revision.
|
||||||
|
//
|
||||||
|
|
Loading…
Reference in a new issue