remove !NEW_INSETS cruft

[lyx.git] / src / support / snprintf.h

diff --git a/src/support/snprintf.h b/src/support/snprintf.h
index cad692e54101e1b043fcf0e32f400c8817a37dcd..03cf914b3d05d9000b4dcf36a0ba9baa55dfe2c6 100644 (file)
--- a/src/support/snprintf.h
+++ b/src/support/snprintf.h
@@ -4,23 +4,34 @@
 #define PORTABLE_SNPRINTF_VERSION_MAJOR 2
 #define PORTABLE_SNPRINTF_VERSION_MINOR 1
 
-#ifdef HAVE_SNPRINTF
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
+#if defined(HAVE_DECL_SNPRINTF) || defined(HAVE_DECL_VSNPRINTF)
 #include <stdio.h>
-#else
-extern int snprintf(char *, size_t, const char *, /*args*/ ...);
-extern int vsnprintf(char *, size_t, const char *, va_list);
+#endif
+#ifndef HAVE_DECL_SNPRINTF
+int snprintf(char *, size_t, const char *, /*args*/ ...);
+#endif
+#ifndef HAVE_DECL_VSNPRINTF
+int vsnprintf(char *, size_t, const char *, va_list);
 #endif
 
 #if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF)
-extern int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...);
-extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap);
+int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...);
+int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap);
 #define snprintf  portable_snprintf
 #define vsnprintf portable_vsnprintf
 #endif
 
-extern int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
-extern int vasprintf (char **ptr, const char *fmt, va_list ap);
-extern int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...);
-extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
+int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
+int vasprintf (char **ptr, const char *fmt, va_list ap);
+int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...);
+int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
 
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
+  
 #endif