[Fedora-directory-commits] ldapserver/lib/base file.cpp,1.6,1.7

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/lib/base

Modified Files:
	file.cpp 
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NET_SSL (Comment #5)



Index: file.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/base/file.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- file.cpp	11 Apr 2006 02:14:52 -0000	1.6
+++ file.cpp	10 Nov 2006 01:10:57 -0000	1.7
@@ -528,8 +528,6 @@
 #endif /* SNI */
 #endif
 
-#ifdef NET_SSL
-
 #define ERRMSG_SIZE 35
 #ifdef THREAD_ANY
 static int errmsg_key = -1;
@@ -537,19 +535,16 @@
 /* Removed for ns security integration
 #include "xp_error.h"
 */
-#else
+#else /* THREAD_ANY */
 static char errmsg[ERRMSG_SIZE];
-#endif
+#endif /* THREAD_ANY */
 
 #include "util.h"
 
-#endif
-
-
 void system_errmsg_init(void)
 {
     if (errmsg_key == -1) {
-#if defined(THREAD_ANY) && defined(NET_SSL)
+#if defined(THREAD_ANY)
         errmsg_key = systhread_newkey();
 #endif
 #ifdef XP_WIN32