Mercurial > hg > xemacs-beta

changeset 2119:13181f978082

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-06-08 12:27:30 by didierv] Remove EXTERN_C_BLOCK_{BEGIN|END}
author didierv
date Tue, 08 Jun 2004 12:27:30 +0000
parents e28998a020ec
children be517946fe1d
files src/ChangeLog src/config.h.in src/nas.c
diffstat 3 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jun 07 21:50:57 2004 +0000
+++ b/src/ChangeLog	Tue Jun 08 12:27:30 2004 +0000
@@ -1,3 +1,9 @@
+2004-06-08  Didier Verna  <didier@xemacs.org>
+
+	* config.h.in (EXTERN_C_BLOCK_BEGIN): Remove.
+	(EXTERN_C_BLOCK_END): Ditto.
+	* nas.c: Use BEGIN_C_DECLS and END_C_DECLS instead.
+
 2004-06-07  Adrian Aichner  <adrian@xemacs.org>
 
 	* device-x.c (x_IO_error_handler): Phrase duplication typo fixes
--- a/src/config.h.in	Mon Jun 07 21:50:57 2004 +0000
+++ b/src/config.h.in	Tue Jun 08 12:27:30 2004 +0000
@@ -957,12 +957,8 @@
 #  define catch c_catch
 
 #  define EXTERN_C extern "C"
-#  define EXTERN_C_BLOCK_BEGIN extern "C" {
-#  define EXTERN_C_BLOCK_END }
 # else /* C code */
 #  define EXTERN_C extern
-#  define EXTERN_C_BLOCK_BEGIN
-#  define EXTERN_C_BLOCK_END
 # endif
 #endif /* C or C++ */
 
--- a/src/nas.c	Mon Jun 07 21:50:57 2004 +0000
+++ b/src/nas.c	Tue Jun 08 12:27:30 2004 +0000
@@ -80,13 +80,13 @@
 #undef LITTLE_ENDIAN
 #undef BIG_ENDIAN
 
-EXTERN_C_BLOCK_BEGIN
+BEGIN_C_DECLS
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>
 #include <audio/snd.h>
 #include <audio/wave.h>
 #include <audio/fileutil.h>
-EXTERN_C_BLOCK_END
+END_C_DECLS
 
 
 /* NAS <= 1.2p5 <audio/fileutil.h> doesn't define the NAS_ versions */