summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-11-10 01:10:57 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-11-10 01:10:57 +0000
commit774a36c8dce821975ecd014b682a51ae2d9c9537 (patch)
treea4147686ceb00efe7f7e5be7fcb9311b99a5dde1 /lib
parent83c29f51c72ba9d202d33ed342ceb4b8625f2ec3 (diff)
downloadds-774a36c8dce821975ecd014b682a51ae2d9c9537.tar.gz
ds-774a36c8dce821975ecd014b682a51ae2d9c9537.tar.xz
ds-774a36c8dce821975ecd014b682a51ae2d9c9537.zip
Resolves: #214728
Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5)
Diffstat (limited to 'lib')
-rw-r--r--lib/base/file.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/base/file.cpp b/lib/base/file.cpp
index 46e9ba16..97e5fe85 100644
--- a/lib/base/file.cpp
+++ b/lib/base/file.cpp
@@ -528,8 +528,6 @@ extern char *sys_errlist[];
#endif /* SNI */
#endif
-#ifdef NET_SSL
-
#define ERRMSG_SIZE 35
#ifdef THREAD_ANY
static int errmsg_key = -1;
@@ -537,19 +535,16 @@ static int errmsg_key = -1;
/* 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