Don't define Rand() if isaac64 is used
This commit is contained in:
@@ -182,15 +182,13 @@ extern void FDECL(interject, (int));
|
||||
#define USE_STDARG
|
||||
|
||||
/* Use the high quality random number routines. */
|
||||
#ifdef USE_ISAAC64
|
||||
#define Rand() rn2(RAND_MAX)
|
||||
#else
|
||||
#define RANDOM
|
||||
#ifdef RANDOM
|
||||
#define Rand() random()
|
||||
#else
|
||||
#define Rand() rand()
|
||||
#endif
|
||||
#ifndef USE_ISAAC64
|
||||
# define RANDOM
|
||||
# ifdef RANDOM
|
||||
# define Rand() random()
|
||||
# else
|
||||
# define Rand() rand()
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
@@ -78,14 +78,12 @@
|
||||
#include <time.h>
|
||||
|
||||
/* the high quality random number routines */
|
||||
#ifdef USE_ISAAC64
|
||||
#define Rand() rn2(RAND_MAX)
|
||||
#else
|
||||
#ifdef RANDOM
|
||||
#define Rand() random()
|
||||
#else
|
||||
#define Rand() rand()
|
||||
#endif
|
||||
#ifndef USE_ISAAC64
|
||||
# ifdef RANDOM
|
||||
# define Rand() random()
|
||||
# else
|
||||
# define Rand() rand()
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* file creation mask */
|
||||
|
||||
@@ -237,14 +237,12 @@
|
||||
#endif
|
||||
|
||||
/* the high quality random number routines */
|
||||
#ifdef USE_ISAAC64
|
||||
#define Rand() rn2(RAND_MAX)
|
||||
#else
|
||||
#ifdef RANDOM
|
||||
#define Rand() random()
|
||||
#else
|
||||
#define Rand() rand()
|
||||
#endif
|
||||
#ifndef USE_ISAAC64
|
||||
# ifdef RANDOM
|
||||
# define Rand() random()
|
||||
# else
|
||||
# define Rand() rand()
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef TOS
|
||||
|
||||
@@ -348,15 +348,13 @@
|
||||
|
||||
/* Use the high quality random number routines. */
|
||||
/* the high quality random number routines */
|
||||
#ifdef USE_ISAAC64
|
||||
#define Rand() rn2(RAND_MAX)
|
||||
#else
|
||||
#if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
|
||||
#ifndef USE_ISAAC64
|
||||
# if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
|
||||
|| defined(RANDOM) || defined(__APPLE__)
|
||||
#define Rand() random()
|
||||
#else
|
||||
#define Rand() lrand48()
|
||||
#endif
|
||||
# define Rand() random()
|
||||
# else
|
||||
# define Rand() lrand48()
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef TIMED_DELAY
|
||||
|
||||
@@ -243,21 +243,19 @@ typedef __mode_t mode_t;
|
||||
#define rindex strrchr
|
||||
|
||||
/* Use the high quality random number routines. */
|
||||
#ifdef USE_ISAAC64
|
||||
#define Rand() rn2(RAND_MAX)
|
||||
#else
|
||||
#if defined(RANDOM)
|
||||
#define Rand() random()
|
||||
#ifndef USE_ISAAC64
|
||||
# if defined(RANDOM)
|
||||
# define Rand() random()
|
||||
/* VMS V7 adds these entry points to DECC$SHR; stick with the nethack-supplied
|
||||
code to avoid having to deal with version-specific conditionalized builds
|
||||
*/
|
||||
#define random nh_random
|
||||
#define srandom nh_srandom
|
||||
#define initstate nh_initstate
|
||||
#define setstate nh_setstate
|
||||
#else
|
||||
#define Rand() rand()
|
||||
#endif
|
||||
# define random nh_random
|
||||
# define srandom nh_srandom
|
||||
# define initstate nh_initstate
|
||||
# define setstate nh_setstate
|
||||
# else
|
||||
# define Rand() rand()
|
||||
# endif
|
||||
#endif
|
||||
#define SYS_RANDOM_SEED
|
||||
|
||||
|
||||
@@ -143,14 +143,12 @@
|
||||
#define USE_STDARG
|
||||
|
||||
/* Use the high quality random number routines. */
|
||||
#ifdef USE_ISAAC64
|
||||
#define Rand() rn2(RAND_MAX)
|
||||
#else
|
||||
#ifdef RANDOM
|
||||
#define Rand() random()
|
||||
#else
|
||||
#define Rand() rand()
|
||||
#endif
|
||||
#ifndef USE_ISAAC64
|
||||
# ifdef RANDOM
|
||||
# define Rand() random()
|
||||
# else
|
||||
# define Rand() rand()
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#define FCMASK 0660 /* file creation mask */
|
||||
|
||||
Reference in New Issue
Block a user