#define *_OPT_ON &ber_pvt_opt_on. The old (void*)1 definition could be == NULL.

diff --git a/include/lber.h b/include/lber.h
index 5db9fb39f3327e193c7c0b0c514d4d110ef1093f..c01b3acc04f59ac2ff4412317ea0a910e6e3050f 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -149,7 +149,8 @@ typedef struct lber_memory_fns {
 #define LBER_OPT_SOCKBUF_DEBUG         0x1002
 
 /* on/off values */
-#define LBER_OPT_ON            ((void *) 1)
+extern char ber_pvt_opt_on;
+#define LBER_OPT_ON            ((void *) &ber_pvt_opt_on)
 #define LBER_OPT_OFF   ((void *) 0)
 
 #define LBER_OPT_SUCCESS       (0)

diff --git a/include/ldap.h b/include/ldap.h
index 6b3fcf14232087b65f42b82ad3a0323fa42099c1..e28755214cde48173b70c9412f0c3983d8242e25 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -144,7 +144,7 @@ LDAP_BEGIN_DECL
 #define        LDAP_OPT_X_SASL_MAXBUFSIZE              0x6109
 
 /* on/off values */
-#define LDAP_OPT_ON            ((void *) 1)
+#define LDAP_OPT_ON            ((void *) &ber_pvt_opt_on)
 #define LDAP_OPT_OFF   ((void *) 0)
 
 /*

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index f59dcc13935a8179a1ceb332d3cd5013b31d5104..d2371567e706a781d6b6ecc4c063bb26967e2c18 100644 (file)
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -10,6 +10,8 @@
 #include <ac/stdarg.h>
 #include "lber-int.h"
 
+char ber_pvt_opt_on;   /* used to get a non-NULL address for *_OPT_ON */
+
 struct lber_options ber_int_options = {
        LBER_UNINITIALIZED, 0, 0, 0 };