Split compat.h into one header per function to avoid issues with e.g. the

vasprintf() prototype needing <stdarg.h> even when it isn't used.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@761 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/mgt_cli.c

@@ -13,7 +13,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "compat.h"
+#include "compat/vasprintf.h"
 #include "cli_priv.h"
 #include "cli.h"
 #include "vsb.h"

bin/varnishd/mgt_vcc.c

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "compat.h"
+#include "compat/asprintf.h"
 #include "vsb.h"
 #include "queue.h"
 

bin/varnishd/storage_file.c

@@ -19,7 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "compat.h"
+#include "compat/asprintf.h"
 #include "shmlog.h"
 #include "cache.h"
 

bin/varnishd/tcp.c

@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "compat/strlcpy.h"
 #include "heritage.h"
 #include "mgt.h"
 

include/Makefile.am

@@ -5,7 +5,10 @@ noinst_HEADERS = \
 	cli.h \
 	cli_common.h \
 	cli_priv.h \
-	compat.h \
+	compat/asprintf.h \
+	compat/strlcat.h \
+	compat/strlcpy.h \
+	compat/vasprintf.h \
 	hash.h \
 	http_headers.h \
 	libvarnish.h \

include/compat.h

-/*
- * $Id$
- */
-
-#ifndef COMPAT_H_INCLUDED
-#define COMPAT_H_INCLUDED
-
-#ifndef HAVE_VASPRINTF
-#ifdef va_start /* make sure <stdarg.h> is in scope */
-int vasprintf(char **strp, const char *fmt, va_list ap);
-#endif
-#endif
-
-#ifndef HAVE_ASPRINTF
-int asprintf(char **strp, const char *fmt, ...);
-#endif
-
-#ifndef HAVE_STRLCPY
-size_t strlcpy(char *dst, const char *src, size_t size);
-#endif
-
-#ifndef HAVE_STRLCAT
-size_t strlcat(char *dst, const char *src, size_t size);
-#endif
-
-#endif

include/compat/asprintf.h

+/*
+ * $Id$
+ */
+
+#ifndef COMPAT_ASPRINTF_H_INCLUDED
+#define COMPAT_ASPRINTF_H_INCLUDED
+
+#ifndef HAVE_ASPRINTF
+int asprintf(char **strp, const char *fmt, ...);
+#endif
+
+#endif

include/compat/strlcat.h

+/*
+ * $Id$
+ */
+
+#ifndef COMPAT_STRLCAT_H_INCLUDED
+#define COMPAT_STRLCAT_H_INCLUDED
+
+#ifndef HAVE_STRLCAT
+size_t strlcat(char *dst, const char *src, size_t size);
+#endif
+
+#endif

include/compat/strlcpy.h

+/*
+ * $Id$
+ */
+
+#ifndef COMPAT_STRLCPY_H_INCLUDED
+#define COMPAT_STRLCPY_H_INCLUDED
+
+#ifndef HAVE_STRLCPY
+size_t strlcpy(char *dst, const char *src, size_t size);
+#endif
+
+#endif

include/compat/vasprintf.h

+/*
+ * $Id$
+ */
+
+#ifndef COMPAT_VASPRINTF_H_INCLUDED
+#define COMPAT_VASPRINTF_H_INCLUDED
+
+#ifndef HAVE_VASPRINTF
+int vasprintf(char **strp, const char *fmt, va_list ap);
+#endif
+
+#endif

lib/libcompat/asprintf.c

@@ -3,12 +3,14 @@
  *
  */
 
+#ifndef HAVE_ASPRINTF
+
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "compat.h"
+#include "compat/asprintf.h"
+#include "compat/vasprintf.h"
 
-#ifndef HAVE_ASPRINTF
 int
 asprintf(char **strp, const char *fmt, ...)
 {

lib/libcompat/strlcat.c

@@ -17,12 +17,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef HAVE_STRLCAT
+
 #include <sys/types.h>
 #include <string.h>
 
-#include "compat.h"
+#include "compat/strlcat.h"
 
-#ifndef HAVE_STRLCAT
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
  * full size of dst, not space left).  At most siz-1 characters

lib/libcompat/strlcpy.c

@@ -17,12 +17,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef HAVE_STRLCPY
+
 #include <sys/types.h>
 #include <string.h>
 
-#include "compat.h"
+#include "compat/strlcpy.h"
 
-#ifndef HAVE_STRLCPY
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).

lib/libcompat/vasprintf.c

@@ -3,13 +3,14 @@
  *
  */
 
+#ifndef HAVE_VASPRINTF
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "compat.h"
+#include "compat/vasprintf.h"
 
-#ifndef HAVE_VASPRINTF
 int
 vasprintf(char **strp, const char *fmt, va_list ap)
 {

lib/libvcl/vcc_compile.c

@@ -49,7 +49,7 @@
 #include <queue.h>
 #include <unistd.h>
 
-#include "compat.h"
+#include "compat/asprintf.h"
 #include "vsb.h"
 
 #include "vcc_priv.h"