Avoid referencing <sys/cdefs.h> and __{BEGIN,END}_DECLS.

Based on Theo Schlossnagle's Solaris portability patch.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1783 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/compat/vis.h b/varnish-cache/include/compat/vis.h
index 7cf4c0859db9abe4d3fb5486e5c38fc87a98fbbe..eb0248911c5ab42fcd7c47d3f07fd7d8a66a30a9 100644 (file)
--- a/varnish-cache/include/compat/vis.h
+++ b/varnish-cache/include/compat/vis.h
@@ -71,15 +71,17 @@
  */
 #define        UNVIS_END       1       /* no more characters */
 
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 char   *vis(char *, int, int, int);
 int    strvis(char *, const char *, int);
 int    strvisx(char *, const char *, size_t, int);
 int    strunvis(char *, const char *);
 int    strunvisx(char *, const char *, int);
 int    unvis(char *, int, int *, int);
-__END_DECLS
+#ifdef __cplusplus
+};
+#endif
 
 #endif /* !_VIS_H_ */

diff --git a/varnish-cache/include/vsb.h b/varnish-cache/include/vsb.h
index aee38780c2eb783ff333d60f20c4c78a356de7d1..f95a1e39d79288247b290132bf073aa0f4161aaf 100644 (file)
--- a/varnish-cache/include/vsb.h
+++ b/varnish-cache/include/vsb.h
@@ -50,7 +50,9 @@ struct vsb {
        int              s_flags;       /* flags */
 };
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*
  * API functions
  */
@@ -73,6 +75,8 @@ char          *vsb_data(struct vsb *);
 int             vsb_len(struct vsb *);
 int             vsb_done(struct vsb *);
 void            vsb_delete(struct vsb *);
-__END_DECLS
+#ifdef __cplusplus
+};
+#endif
 
 #endif