diff options
| author | nelson%bolyard.com <devnull@localhost> | 2009-04-02 02:32:51 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2009-04-02 02:32:51 +0000 |
| commit | f1d6e26241cacf1b3e4a8a3bceff0facf61088ed (patch) | |
| tree | a67325a5d565bda1be1422873080464226ff508f | |
| parent | e08bf52f186daca756e4c90dee4ce4f30579daf8 (diff) | |
| download | nss-hg-f1d6e26241cacf1b3e4a8a3bceff0facf61088ed.tar.gz | |
Backout the checkin for bug 431958, which Defined _X86_ on Win64.NSS_3_12_3_RTMNSS_3_12_3_RC0
| -rw-r--r-- | security/nss/lib/freebl/Makefile | 9 | ||||
| -rw-r--r-- | security/nss/lib/freebl/win_rand.c | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile index e3939c6e8..3abd3c646 100644 --- a/security/nss/lib/freebl/Makefile +++ b/security/nss/lib/freebl/Makefile @@ -77,12 +77,13 @@ endif ifdef FREEBL_NO_DEPEND DEFINES += -DFREEBL_NO_DEPEND endif -# some freebl code wants _X86_ defined for Intel CPUs, both 32 and 64 bits. -# coreconf does not do this consistently between platforms. It does for -# Win32, but not for Win64, Solaris x64, FreeBSD, etc. -ifeq (,$(filter-out x386 x86 x86_64,$(CPU_ARCH))) +# some code wants _X86_ defined for intel CPUs. +# coreconf does this for windows, but not for Linux, FreeBSD, etc. +ifeq (,$(filter-out x86 x86_64,$(CPU_ARCH))) +ifneq (,$(filter-out WIN%,$(OS_TARGET))) DEFINES += -D_X86_ endif +endif ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD diff --git a/security/nss/lib/freebl/win_rand.c b/security/nss/lib/freebl/win_rand.c index c24af0a11..37eb11737 100644 --- a/security/nss/lib/freebl/win_rand.c +++ b/security/nss/lib/freebl/win_rand.c @@ -34,10 +34,6 @@ * * ***** END LICENSE BLOCK ***** */ -#if defined(_WIN32) && defined(NSS_USE_64) -#undef _X86_ -#endif - #include "secrng.h" #include "secerr.h" |