[Fedora-directory-commits] ldapserver/config config.mk, 1.8, 1.9 SunOS5.mk, 1.4, 1.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/config

Modified Files:
	config.mk SunOS5.mk 
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)



Index: config.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/config.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config.mk	3 Oct 2005 19:53:40 -0000	1.8
+++ config.mk	10 Nov 2006 01:27:34 -0000	1.9
@@ -411,7 +411,7 @@
 # Platform dependent switching off of NSPR and JAVA
 #
 ifndef NO_NSPR
-DEFINES		+= -DNSPR -DNSPR20
+DEFINES		+= -DNSPR
 endif
 
 ifndef NO_JAVA


Index: SunOS5.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/SunOS5.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SunOS5.mk	19 Apr 2005 22:06:42 -0000	1.4
+++ SunOS5.mk	10 Nov 2006 01:27:34 -0000	1.5
@@ -77,11 +77,7 @@
 
 # Purify doesn't like -MDupdate
 ifeq ($(USE_KERNEL_THREADS), 1)
-ifdef NSPR20
-NOMD_OS_CFLAGS		= $(MOZ_CFLAGS) -DNSPR20 -D_PR_NTHREAD -D_REENTRANT $(SOL_CFLAGS)
-else
-NOMD_OS_CFLAGS		= $(MOZ_CFLAGS) -DHW_THREADS -D_REENTRANT $(SOL_CFLAGS)
-endif
+NOMD_OS_CFLAGS		= $(MOZ_CFLAGS) -D_PR_NTHREAD -D_REENTRANT $(SOL_CFLAGS)
 OS_LIBS			= -lthread -lposix4 -lsocket -lnsl -ldl
 else
 NOMD_OS_CFLAGS		= $(MOZ_CFLAGS) -DSW_THREADS $(SOL_CFLAGS)