summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/include/includes.h5
-rw-r--r--source4/lib/replace/replace.h23
-rw-r--r--source4/lib/replace/strptime.c2
-rw-r--r--source4/lib/util/util.h23
4 files changed, 24 insertions, 29 deletions
diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h
index a04f7a0e97..85f99280da 100644
--- a/source4/lib/ldb/include/includes.h
+++ b/source4/lib/ldb/include/includes.h
@@ -16,11 +16,6 @@
#define dyn_MODULESDIR dyn_LIBDIR
#endif
-
-
-#define discard_const(ptr) ((void *)((intptr_t)(ptr)))
-#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
-
#include "replace.h"
#include "system/filesys.h"
#include "system/network.h"
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 7d6dcec7f1..959d44b33e 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -79,6 +79,29 @@
#include <stddef.h>
#endif
+/**
+ this is a warning hack. The idea is to use this everywhere that we
+ get the "discarding const" warning from gcc. That doesn't actually
+ fix the problem of course, but it means that when we do get to
+ cleaning them up we can do it by searching the code for
+ discard_const.
+
+ It also means that other error types aren't as swamped by the noise
+ of hundreds of const warnings, so we are more likely to notice when
+ we get new errors.
+
+ Please only add more uses of this macro when you find it
+ _really_ hard to fix const warnings. Our aim is to eventually use
+ this function in only a very few places.
+
+ Also, please call this via the discard_const_p() macro interface, as that
+ makes the return type safe.
+*/
+#define discard_const(ptr) ((void *)((intptr_t)(ptr)))
+
+/** Type-safe version of discard_const */
+#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
+
#ifndef HAVE_STRERROR
extern char *sys_errlist[];
#define strerror(i) sys_errlist[i]
diff --git a/source4/lib/replace/strptime.c b/source4/lib/replace/strptime.c
index 8fb919472e..d415b7826e 100644
--- a/source4/lib/replace/strptime.c
+++ b/source4/lib/replace/strptime.c
@@ -974,7 +974,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
if (want_xday && !have_yday)
day_of_the_year (tm);
- return (char *) rp;
+ return discard_const_p(char, rp);
}
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h
index c7acc2ea33..dd6c1499bd 100644
--- a/source4/lib/util/util.h
+++ b/source4/lib/util/util.h
@@ -107,27 +107,4 @@ extern const char *panic_action;
#define strlen(x) valgrind_strlen(x)
#endif
-/**
- this is a warning hack. The idea is to use this everywhere that we
- get the "discarding const" warning from gcc. That doesn't actually
- fix the problem of course, but it means that when we do get to
- cleaning them up we can do it by searching the code for
- discard_const.
-
- It also means that other error types aren't as swamped by the noise
- of hundreds of const warnings, so we are more likely to notice when
- we get new errors.
-
- Please only add more uses of this macro when you find it
- _really_ hard to fix const warnings. Our aim is to eventually use
- this function in only a very few places.
-
- Also, please call this via the discard_const_p() macro interface, as that
- makes the return type safe.
-*/
-#define discard_const(ptr) ((void *)((intptr_t)(ptr)))
-
-/** Type-safe version of discard_const */
-#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
-
#endif /* _SAMBA_UTIL_H_ */