(U-0002195D): Add `ideographic-structure'; add `sound@ja/on'; add

[chise/xemacs-chise.git.1] / src / broken-sun.h

diff --git a/src/broken-sun.h b/src/broken-sun.h
index 2bf0429..946dddf 100644 (file)
--- a/src/broken-sun.h
+++ b/src/broken-sun.h
@@ -25,8 +25,8 @@ Boston, MA 02111-1307, USA.  */
 /* Sun's standard and GCC's header files leave out prototypes for
    all sorts of functions. */
 
-#ifndef _XEMACS_BROKEN_SUN_H_
-#define _XEMACS_BROKEN_SUN_H_
+#ifndef INCLUDED_broken_sun_h_
+#define INCLUDED_broken_sun_h_
 
 #ifdef __GNUC__
 #include <stdlib.h>
@@ -34,15 +34,15 @@ Boston, MA 02111-1307, USA.  */
 
 /*********************** stdlib functions *********************/
 
-/* void *      memchr (CONST void *, int, size_t); */
+/* void *      memchr (const void *, int, size_t); */
 
-/* int memcmp (CONST void *, CONST void *, size_t); */
-/* void *      memcpy (void *, CONST void *, size_t); */
-/* void *      memmove (void *, CONST void *, size_t);*/
+/* int memcmp (const void *, const void *, size_t); */
+/* void *      memcpy (void *, const void *, size_t); */
+/* void *      memmove (void *, const void *, size_t);*/
 /* void *      memset (void *, int, int); */
-/* char *      strcat (char *, CONST char *); */
-/* char *      strchr (CONST char *, int); */
-/* int strcmp (CONST char *, CONST char *); */
+/* char *      strcat (char *, const char *); */
+/* char *      strchr (const char *, int); */
+/* int strcmp (const char *, const char *); */
 int    strcasecmp (char *, char *);
 
 /* Yes, they even left these functions out! */
@@ -53,39 +53,39 @@ int      toupper (int);
 
 #include <stdio.h> /* else can't declare FILE */
 
-/* FILE        *fopen (CONST char *, CONST char *); */
-/* FILE        *freopen (CONST char *, CONST char *, FILE *); */
+/* FILE        *fopen (const char *, const char *); */
+/* FILE        *freopen (const char *, const char *, FILE *); */
 FILE   *tmpfile (void);
 int    fclose (FILE *);
 char   *fgets (char *, int, FILE *);
 int      fgetc (FILE *);
 int      fflush (FILE *);
-int      fprintf (FILE *, CONST char *, ...);
+int      fprintf (FILE *, const char *, ...);
 int      fputc (char, FILE *);
-int      fputs (CONST char *, FILE *);
+int      fputs (const char *, FILE *);
 size_t   fread (void *, size_t, size_t, FILE *);
-int      fscanf (FILE *, CONST char *, ...);
+int      fscanf (FILE *, const char *, ...);
 int    fgetpos (FILE *, long *);
 int      fseek (FILE *, long, int);
-int    fsetpos (FILE *, CONST long *);
+int    fsetpos (FILE *, const long *);
 long     ftell (FILE *);
-size_t   fwrite (CONST void *, size_t, size_t, FILE *);
+size_t   fwrite (const void *, size_t, size_t, FILE *);
 char   *gets (char *);
 int    pclose (FILE *);
-void     perror (CONST char *);
-int      printf (CONST char *, ...);
-int      puts (CONST char *);
-int      remove (CONST char *);
-int      rename (CONST char *, CONST char *);
+void     perror (const char *);
+int      printf (const char *, ...);
+int      puts (const char *);
+int      remove (const char *);
+int      rename (const char *, const char *);
 int      rewind (FILE *);
-int    scanf (CONST char *, ...);
-int    sscanf (CONST char *, CONST char *, ...);
+int    scanf (const char *, ...);
+int    sscanf (const char *, const char *, ...);
 void   setbuf (FILE *, char *);
 int    setvbuf (FILE *, char *, int, size_t);
 int    ungetc (int, FILE *);
-int    vprintf (CONST char *, void *);
-int    vfprintf (FILE *, CONST char *, void *);
-char   *vsprintf (char *, CONST char *, void *);
+int    vprintf (const char *, void *);
+int    vfprintf (FILE *, const char *, void *);
+char   *vsprintf (char *, const char *, void *);
 
 /*********************** signal functions *********************/
 
@@ -101,7 +101,7 @@ int sigpause (int);
 struct timeval;
 struct timezone;
 
-int    utimes (CONST char *, struct timeval *);
+int    utimes (const char *, struct timeval *);
 void   tzset (void);
 time_t time (time_t *);
 int    gettimeofday (struct timeval *, struct timezone *);
@@ -112,12 +112,12 @@ struct stat;
 #include </usr/include/sys/types.h>
 
 int    fsync (int);
-int    lstat (CONST char *, struct stat *);
+int    lstat (const char *, struct stat *);
 int    fchmod (int, mode_t);
 char   *mktemp (char *);
-/* int creat (CONST char *, mode_t); better no decl than a conflicting one... */
-int    symlink (CONST char *, CONST char *);
-int    readlink (CONST char *, char *, int);
+/* int creat (const char *, mode_t); better no decl than a conflicting one... */
+int    symlink (const char *, const char *);
+int    readlink (const char *, char *, int);
 void   sync (void);
 int    select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
 char * getwd (char *);
@@ -146,7 +146,7 @@ int system (char *);
 
 int    ioctl (int, int, ...);
 struct nlist;
-int    nlist (CONST char *, struct nlist *);
+int    nlist (const char *, struct nlist *);
 int    munmap (void *, int);
 int    brk (void *);
 void * sbrk (int);
@@ -158,10 +158,10 @@ int       mprotect (void *, int, int);
 
 /*********************** miscellaneous functions *********************/
 
-void   tputs (CONST char *cp, int affcnt, void (*)(int));
+void   tputs (const char *cp, int affcnt, void (*)(int));
 long   random (void);
 int    srandom (int seed);
 
 #endif /* __GNUC__ */
 
-#endif /* _XEMACS_BROKEN_SUN_H_ */
+#endif /* INCLUDED_broken_sun_h_ */