Mercurial > hg > xemacs-beta

diff src/libinterface.h @ 1743:543769b89fed
[xemacs-hg @ 2003-10-14 05:02:57 by james] New compiler.h contains compiler-specific defines. Use it everywhere.
author: james
date: Tue, 14 Oct 2003 05:03:13 +0000
parents: 26a2f3423141
children: 1cecc3e9f0a0
--- a/src/libinterface.h	Mon Oct 13 18:53:24 2003 +0000
+++ b/src/libinterface.h	Tue Oct 14 05:03:13 2003 +0000
@@ -28,9 +28,7 @@
 #endif /* HAVE_GIF */
 
 #ifdef HAVE_PNG
-#ifdef __cplusplus
-extern "C" {
-#endif
+BEGIN_C_DECLS
 #define message message_ /* Yuck */
   /* See comment in libinterface.c for the following */
 #define PNG_EXPORT(type, symbol) type XCDECL symbol
@@ -38,9 +36,7 @@
 #define ZEXPORTVA XCDECL
 #include <png.h>
 #undef message
-#ifdef __cplusplus
-}
-#endif
+END_C_DECLS
 #endif /* HAVE_PNG */
 
 /* #### WARNING: Utterly random magic here to prevent namespace conflicts
@@ -49,9 +45,7 @@
    glyphs-msw.c.  For some reason, putting the XPM code after this fixes
    other problems; don't move it before. --ben */
 #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG)
-#ifdef __cplusplus
-extern "C" {
-#endif
+BEGIN_C_DECLS
 #ifdef _MSC_VER
 # ifndef XMD_H
   /* Yuck!  This tricks jpeglib.h into not defining INT32, which is defined
@@ -65,9 +59,7 @@
 # undef XMD_H
 #endif
 #include <jerror.h>
-#ifdef __cplusplus
-}
-#endif
+END_C_DECLS
 
 boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo);
 boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo);