From: Ted Lemon <source@isc.org>
Date: Thu, 27 Jan 2000 23:37:38 +0000 (+0000)
Subject: Move log functions to omapip_p.h because they require cdefs.h.
X-Git-Tag: V3-BETA-2-PATCH-1~377
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=400c0b19bebe5c24319dbd5ba0bbe84948a1a855;p=thirdparty%2Fdhcp.git

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

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 427267b29..826a41f87 100644
--- 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 d875f8a1d..4d6b63675 100644
--- 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 90b73c701..296ebfa2c 100644
--- 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__ */