X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fnas.c;h=ceba9a2acd1d2054e5511fd25c27e6f95b8cc990;hb=3aca7317dd930beecbddba646284279744087e69;hp=a338ad1ed2b85a46a46e83d18ef22c5b657db1d5;hpb=ea21eb75bbf90355514d65686bd53bea579f8e23;p=chise%2Fxemacs-chise.git-

diff --git a/src/nas.c b/src/nas.c
index a338ad1..ceba9a2 100644
--- a/src/nas.c
+++ b/src/nas.c
@@ -108,7 +108,6 @@
 
 #else /* !emacs */
 #    define warn(str) fprintf (stderr, "%s\n", (str))
-#    define CONST const
 #endif /* emacs */
 
 #ifdef XTOOLKIT
@@ -624,7 +623,7 @@ CatchErrorAndJump (AuServer *old_aud,
 /* Create a name from the sound. */
 
 static char *
-NameFromData (CONST char *buf,
+NameFromData (const char *buf,
 	      int len)
 
 {
@@ -668,7 +667,7 @@ NameFromData (CONST char *buf,
  */
 
 static SndInfo *
-SndOpenDataForReading (CONST char *data,
+SndOpenDataForReading (const char *data,
 		       int length)
 
 {
@@ -744,11 +743,11 @@ static size_t file_posn;
 /* The length of the "file" */
 static size_t file_len;
 /* The actual "file" data. */
-static CONST void* file_data;
+static const void* file_data;
 
 /* Like fopen, but for a buffer in memory */
 static void
-dopen (CONST void* data, size_t length)
+dopen (const void* data, size_t length)
 {
    file_data = data;
    file_len = length;
@@ -799,7 +798,7 @@ dseek (long offset, int from)
 
 /* Like ftell, but for a buffer in memory */
 static long
-dtell()
+dtell (void)
 {
   return file_posn;
 }
@@ -807,7 +806,7 @@ dtell()
 /* Data buffer analogs for FileReadS and FileReadL in NAS. */
 
 static unsigned short
-DataReadS(int swapit)
+DataReadS (int swapit)
 {
     unsigned short us;
 
@@ -818,7 +817,7 @@ DataReadS(int swapit)
 }
 
 static AuUint32
-DataReadL(int swapit)
+DataReadL (int swapit)
 {
     AuUint32 ul;
 
@@ -829,7 +828,7 @@ DataReadL(int swapit)
 }
 
 static int
-readChunk(RiffChunk *c)
+readChunk (RiffChunk *c)
 {
     int             status;
     char            n;
@@ -845,8 +844,8 @@ readChunk(RiffChunk *c)
    read the wave data from a buffer in memory. */
 
 static WaveInfo *
-WaveOpenDataForReading(CONST char *data,
-		       int length)
+WaveOpenDataForReading (const char *data,
+			int length)
 {
     RiffChunk       ck;
     RIFF_FOURCC     fourcc;