X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fnas.c;h=bc473aa811040eb5b4b9bad8169abd4f815f8546;hb=15fd1e6e063e07e811ab9d9e4611682baa4df555;hp=ceba9a2acd1d2054e5511fd25c27e6f95b8cc990;hpb=f52a96980ed9280f8f906a20d4b899dc0b027644;p=chise%2Fxemacs-chise.git

diff --git a/src/nas.c b/src/nas.c
index ceba9a2..bc473aa 100644
--- a/src/nas.c
+++ b/src/nas.c
@@ -68,15 +68,30 @@
 #include <unistd.h>
 #endif
 
+/* NAS <= 1.2p5 defines {BIG,LITTLE}_ENDIAN in <audio/fileutil.h>,
+   conflicting with GNU libc (at least); newer versions avoid this
+   name space pollution.
 
+   DO NOT USE THOSE MACROS in this file.  Use NAS_{BIG,LITTLE}_ENDIAN.
+
+   It would be slightly more reliable to do this via configure, but that
+   seems unnecessarily complex.
+*/
 #undef LITTLE_ENDIAN
 #undef BIG_ENDIAN
+
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>
 #include <audio/snd.h>
 #include <audio/wave.h>
 #include <audio/fileutil.h>
 
+/* NAS <= 1.2p5 <audio/fileutil.h> doesn't define the NAS_ versions */
+#ifndef NAS_LITTLE_ENDIAN
+#define NAS_LITTLE_ENDIAN LITTLE_ENDIAN
+#define NAS_BIG_ENDIAN BIG_ENDIAN
+#endif
+
 #ifdef emacs
 
 #    define XTOOLKIT
@@ -682,7 +697,7 @@ SndOpenDataForReading (const char *data,
 
   memcpy (&si->h, data, sizeof (SndHeader));
 
-  if (LITTLE_ENDIAN)
+  if (NAS_LITTLE_ENDIAN)
     {
       char            n;
     
@@ -834,7 +849,7 @@ readChunk (RiffChunk *c)
     char            n;
 
     if ((status = dread(c, sizeof(RiffChunk), 1)))
-	if (BIG_ENDIAN)
+	if (NAS_BIG_ENDIAN)
 	    swapl(&c->ckSize, n);
 
     return status;
@@ -920,18 +935,18 @@ WaveOpenDataForReading (const char *data,
 	{
 	    AuInt32            dummy;
 
-	    wi->format = DataReadS(BIG_ENDIAN);
-	    wi->channels = DataReadS(BIG_ENDIAN);
-	    wi->sampleRate = DataReadL(BIG_ENDIAN);
+	    wi->format = DataReadS(NAS_BIG_ENDIAN);
+	    wi->channels = DataReadS(NAS_BIG_ENDIAN);
+	    wi->sampleRate = DataReadL(NAS_BIG_ENDIAN);
 
 	    /* we don't care about the next two fields */
-	    dummy = DataReadL(BIG_ENDIAN);
-	    dummy = DataReadS(BIG_ENDIAN);
+	    dummy = DataReadL(NAS_BIG_ENDIAN);
+	    dummy = DataReadS(NAS_BIG_ENDIAN);
 
 	    if (wi->format != RIFF_WAVE_FORMAT_PCM)
 		Err();
 
-	    wi->bitsPerSample = DataReadS(BIG_ENDIAN);
+	    wi->bitsPerSample = DataReadS(NAS_BIG_ENDIAN);
 
 	    /* skip any other format specific fields */
 	    dseek(PAD2(ck.ckSize - 16), 1);