aboutsummaryrefslogtreecommitdiff
path: root/X11
diff options
context:
space:
mode:
Diffstat (limited to 'X11')
-rw-r--r--X11/Xw32defs.h1
-rw-r--r--X11/fonts/bdfint.h6
-rw-r--r--X11/fonts/fntfil.h2
-rw-r--r--X11/fonts/fontmisc.h2
4 files changed, 5 insertions, 6 deletions
diff --git a/X11/Xw32defs.h b/X11/Xw32defs.h
index 5fbc6bc21..f59c6dae7 100644
--- a/X11/Xw32defs.h
+++ b/X11/Xw32defs.h
@@ -27,7 +27,6 @@ typedef char *caddr_t;
# define execve _execve
# define execvp _execvp
# define execvpe _execvpe
-# define fdopen _fdopen
# define fileno _fileno
# define fstat _fstat
# define getcwd _getcwd
diff --git a/X11/fonts/bdfint.h b/X11/fonts/bdfint.h
index d41c4a556..8ce4a0cb1 100644
--- a/X11/fonts/bdfint.h
+++ b/X11/fonts/bdfint.h
@@ -68,11 +68,11 @@ typedef struct BDFSTAT {
BOOL haveDefaultCh;
} bdfFileState;
-extern void bdfError ( char * message, ... );
-extern void bdfWarning ( char *message, ... );
+extern void bdfError ( const char * message, ... );
+extern void bdfWarning ( const char *message, ... );
extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf,
int len );
-extern Atom bdfForceMakeAtom ( char *str, int *size );
+extern Atom bdfForceMakeAtom ( const char *str, int *size );
extern Atom bdfGetPropertyValue ( char *s );
extern int bdfIsInteger ( char *str );
extern unsigned char bdfHexByte ( unsigned char *s );
diff --git a/X11/fonts/fntfil.h b/X11/fonts/fntfil.h
index 074f2d0ea..a5fa720fa 100644
--- a/X11/fonts/fntfil.h
+++ b/X11/fonts/fntfil.h
@@ -141,7 +141,7 @@ extern void FontFileFreeDir ( FontDirectoryPtr dir );
extern void FontFileFreeEntry ( FontEntryPtr entry );
extern void FontFileFreeTable ( FontTablePtr table );
extern Bool FontFileInitTable ( FontTablePtr table, int size );
-extern FontDirectoryPtr FontFileMakeDir ( char *dirName, int size );
+extern FontDirectoryPtr FontFileMakeDir ( const char *dirName, int size );
extern Bool FontFileMatchName ( char *name, int length, FontNamePtr pat );
extern char * FontFileSaveString ( char *s );
extern void FontFileSortDir ( FontDirectoryPtr dir );
diff --git a/X11/fonts/fontmisc.h b/X11/fonts/fontmisc.h
index 92d4966ca..b7c948f8e 100644
--- a/X11/fonts/fontmisc.h
+++ b/X11/fonts/fontmisc.h
@@ -64,7 +64,7 @@ extern int close();
#define FALSE 0
#endif
-extern Atom MakeAtom ( char *string, unsigned len, int makeit );
+extern Atom MakeAtom ( const char *string, unsigned len, int makeit );
extern int ValidAtom ( Atom atom );
extern char *NameForAtom (Atom atom);