Move log functions to omapip_p.h because they require cdefs.h.

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 427267b29c5c4d76f9957cbd087f13cd6350587a..826a41f875c78a2d769cc74774c2d9089923d51c 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -58,7 +58,7 @@
 #include "dhctoken.h"
 
 #include <isc/result.h>
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 #if !defined (OPTION_HASH_SIZE)
 # define OPTION_HASH_SIZE 17

diff --git a/includes/omapip/omapip.h b/includes/omapip/omapip.h
index d875f8a1d25673f26d667a755d1b3a45bd629b3d..4d6b636759d253a62fde6b857266aff1ae7861ed 100644 (file)
--- a/includes/omapip/omapip.h
+++ b/includes/omapip/omapip.h
@@ -378,18 +378,4 @@ void dmalloc_dump_outstanding (void);
 #if defined (DEBUG_RC_HISTORY)
 void dump_rc_history (void);
 #endif
-
-extern int log_priority;
-extern int log_perror;
-extern void (*log_cleanup) (void);
-
-void log_fatal (const char *, ...)
-       __attribute__((__format__(__printf__,1,2)));
-int log_error (const char *, ...)
-       __attribute__((__format__(__printf__,1,2)));
-int log_info (const char *, ...)
-       __attribute__((__format__(__printf__,1,2)));
-int log_debug (const char *, ...)
-       __attribute__((__format__(__printf__,1,2)));
-void do_percentm (char *obuf, const char *ibuf);
 #endif /* _OMAPIP_H_ */

diff --git a/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h
index 90b73c701829c2537e4bfdf36282be361849d879..296ebfa2caf1af9a2705620d851837fc0a98e356 100644 (file)
--- a/includes/omapip/omapip_p.h
+++ b/includes/omapip/omapip_p.h
@@ -186,4 +186,18 @@ typedef struct __omapi_handle_table {
 } omapi_handle_table_t;
 
 #include <omapip/alloc.h>
+
+extern int log_priority;
+extern int log_perror;
+extern void (*log_cleanup) (void);
+
+void log_fatal (const char *, ...)
+       __attribute__((__format__(__printf__,1,2)));
+int log_error (const char *, ...)
+       __attribute__((__format__(__printf__,1,2)));
+int log_info (const char *, ...)
+       __attribute__((__format__(__printf__,1,2)));
+int log_debug (const char *, ...)
+       __attribute__((__format__(__printf__,1,2)));
+void do_percentm (char *obuf, const char *ibuf);
 #endif /* __OMAPIP_OMAPIP_P_H__ */