# HG changeset patch
# User didierv
# Date 1086697650 0
# Node ID 13181f978082eee470b48af24014d8fa9dc39dd8
# Parent  e28998a020ec89f68393f550ce6b14136c883a89
[xemacs-hg @ 2004-06-08 12:27:30 by didierv]
Remove EXTERN_C_BLOCK_{BEGIN|END}

diff -r e28998a020ec -r 13181f978082 src/ChangeLog
--- 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
diff -r e28998a020ec -r 13181f978082 src/config.h.in
--- 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++ */
 
diff -r e28998a020ec -r 13181f978082 src/nas.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 */