diff options
| author | MadCamel <madcamel@gmail.com> | 2009-09-30 13:50:50 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2009-09-30 13:50:50 -0400 |
| commit | cf1920e296365c8323fd52b6d927766d296b59c6 (patch) | |
| tree | adb2d732b8243f017b1c1367222f80eaeb9b5313 | |
| parent | 765c84f370747e35902757b6771368009ae2a8f6 (diff) | |
| download | tmwa-cf1920e296365c8323fd52b6d927766d296b59c6.tar.gz tmwa-cf1920e296365c8323fd52b6d927766d296b59c6.tar.bz2 tmwa-cf1920e296365c8323fd52b6d927766d296b59c6.tar.xz tmwa-cf1920e296365c8323fd52b6d927766d296b59c6.zip | |
Revert "Added -fno-strict-aliasing to CFLAGS This will likely fix a few minor weirdnesses, and compiler warnings."
This reverts commit 765c84f370747e35902757b6771368009ae2a8f6.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/common/mt_rand.c | 9 | ||||
| -rw-r--r-- | src/common/mt_rand.h | 1 | ||||
| -rw-r--r-- | src/common/utils.h | 2 |
4 files changed, 3 insertions, 13 deletions
@@ -18,10 +18,10 @@ OPT = -g -O2 ${M32} ifeq ($(findstring CYGWIN,$(PLATFORM)), CYGWIN) OS_TYPE = -DCYGWIN -CFLAGS = $(OPT) -Wall -fno-strict-aliasing -DFD_SETSIZE=4096 -I../common $(PACKETDEF) $(OS_TYPE) +CFLAGS = $(OPT) -Wall -DFD_SETSIZE=4096 -I../common $(PACKETDEF) $(OS_TYPE) else OS_TYPE = -CFLAGS = $(OPT) -Wall -fno-strict-aliasing -Wno-pointer-sign -I../common $(PACKETDEF) $(OS_TYPE) +CFLAGS = $(OPT) -Wall -Wno-pointer-sign -I../common $(PACKETDEF) $(OS_TYPE) endif MKDEF = CC="$(CC)" CFLAGS="$(CFLAGS)" diff --git a/src/common/mt_rand.c b/src/common/mt_rand.c index fc9a9ec..ab733ae 100644 --- a/src/common/mt_rand.c +++ b/src/common/mt_rand.c @@ -108,12 +108,3 @@ unsigned long mt_random(void) y ^= (y << 15) & 0xEFC60000U; return(y ^ (y >> 18)); } - -int mt_rand(void) { - unsigned long r = mt_random(); - while (r >> 16) - r = (r & 0xFFFF) + (r >> 16); - - return(r); -} - diff --git a/src/common/mt_rand.h b/src/common/mt_rand.h index bda5861..07f6ef0 100644 --- a/src/common/mt_rand.h +++ b/src/common/mt_rand.h @@ -4,6 +4,5 @@ void mt_seed(unsigned long seed); unsigned long mt_reload(void); unsigned long mt_random(void); -int mt_rand(void); #endif /* __mt_rand_h */ diff --git a/src/common/utils.h b/src/common/utils.h index 3493808..0b006c3 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -38,5 +38,5 @@ * MRAND(10), returns 0-9. * MPRAND(5,10) returns 5-14. */ -#define MRAND(mod) (mt_rand() % mod) +#define MRAND(mod) (int) (mt_random() % mod) #define MPRAND(add, mod) add + MRAND(mod) |