aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--fontconfig/src/fclist.c2
-rw-r--r--libXext/src/XAppgroup.c4
-rw-r--r--libXfont/include/X11/fonts/bdfint.h6
-rw-r--r--libXfont/include/X11/fonts/fntfil.h2
-rw-r--r--libXfont/include/X11/fonts/fontmisc.h2
-rw-r--r--libXpm/src/RdFToBuf.c1
-rw-r--r--xkbcomp/xkbscan.c2
-rw-r--r--xorg-server/glx/glxdricommon.c3
-rw-r--r--xorg-server/include/input.h2
13 files changed, 17 insertions, 18 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);
diff --git a/fontconfig/src/fclist.c b/fontconfig/src/fclist.c
index c56e24c7b..0dac6f3ed 100644
--- a/fontconfig/src/fclist.c
+++ b/fontconfig/src/fclist.c
@@ -80,7 +80,7 @@ FcObjectSetAdd (FcObjectSet *os, const char *object)
}
if (c < 0)
mid++;
- memmove (os->objects + mid + 1, os->objects + mid,
+ memmove ((void*)(os->objects + mid + 1), os->objects + mid,
(os->nobject - mid) * sizeof (const char *));
os->objects[mid] = object;
os->nobject++;
diff --git a/libXext/src/XAppgroup.c b/libXext/src/XAppgroup.c
index b5642f3ba..b1c6fd1f8 100644
--- a/libXext/src/XAppgroup.c
+++ b/libXext/src/XAppgroup.c
@@ -337,7 +337,7 @@ Bool
XagCreateAssociation(Display* dpy, Window* window_return, void* system_window)
{
#ifdef WIN32
- long tmp = *(HWND*) system_window;
+ HWND tmp = *(HWND*) system_window;
XExtDisplayInfo *info = find_display (dpy);
xXagCreateAssocReq *req;
@@ -350,7 +350,7 @@ XagCreateAssociation(Display* dpy, Window* window_return, void* system_window)
*window_return = req->window = XAllocID(dpy);
req->window_type = XagWindowTypeWin32;
req->system_window_len = sizeof(HWND);
- Data32 (dpy, (long*) tmp, 1L);
+ Data32 (dpy, (HWND*) tmp, sizeof(HWND)/4);
req->length++;
UnlockDisplay(dpy);
SyncHandle();
diff --git a/libXfont/include/X11/fonts/bdfint.h b/libXfont/include/X11/fonts/bdfint.h
index 913f660df..bd0786cb9 100644
--- a/libXfont/include/X11/fonts/bdfint.h
+++ b/libXfont/include/X11/fonts/bdfint.h
@@ -65,11 +65,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 ( cosnt 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/libXfont/include/X11/fonts/fntfil.h b/libXfont/include/X11/fonts/fntfil.h
index 25d1f3054..a66965a08 100644
--- a/libXfont/include/X11/fonts/fntfil.h
+++ b/libXfont/include/X11/fonts/fntfil.h
@@ -138,7 +138,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/libXfont/include/X11/fonts/fontmisc.h b/libXfont/include/X11/fonts/fontmisc.h
index cd9d52a64..a1cce67f2 100644
--- a/libXfont/include/X11/fonts/fontmisc.h
+++ b/libXfont/include/X11/fonts/fontmisc.h
@@ -52,7 +52,7 @@ in this Software without prior written authorization from The Open Group.
#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);
diff --git a/libXpm/src/RdFToBuf.c b/libXpm/src/RdFToBuf.c
index d142750de..bbd5dfb93 100644
--- a/libXpm/src/RdFToBuf.c
+++ b/libXpm/src/RdFToBuf.c
@@ -55,7 +55,6 @@
typedef long off_t;
#define stat _stat
#define fstat _fstat
-#define fdopen _fdopen
#define O_RDONLY _O_RDONLY
#endif
diff --git a/xkbcomp/xkbscan.c b/xkbcomp/xkbscan.c
index 221f269b9..9a265d35b 100644
--- a/xkbcomp/xkbscan.c
+++ b/xkbcomp/xkbscan.c
@@ -55,7 +55,7 @@ static int readBufPos = 0;
static int readBufLen = 0;
#ifdef DEBUG
-extern int debugFlags;
+extern unsigned int debugFlags;
static char *
tokText(int tok)
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c
index 97870b47e..79922154a 100644
--- a/xorg-server/glx/glxdricommon.c
+++ b/xorg-server/glx/glxdricommon.c
@@ -58,6 +58,7 @@ getUST(int64_t * ust)
#ifdef _MSC_VER
DebugBreak();
+ return -EFAULT;
#else
if (gettimeofday(&tv, NULL) == 0) {
ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;
@@ -66,7 +67,7 @@ getUST(int64_t * ust)
else {
return -errno;
}
- #endif
+#endif
}
const __DRIsystemTimeExtension systemTimeExtension = {
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 1745e9ade..f913e34ac 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -570,7 +570,7 @@ extern void TouchEventHistoryReplay(TouchPointInfoPtr ti, DeviceIntPtr dev,
extern Bool TouchResourceIsOwner(TouchPointInfoPtr ti, XID resource);
extern void TouchAddListener(TouchPointInfoPtr ti, XID resource, int resource_type,
enum InputLevel level, enum TouchListenerType type,
- enum TouchListenerState state, WindowPtr window, GrabPtr grab);
+ enum TouchListenerState state, WindowPtr window, const GrabPtr grab);
extern Bool TouchRemoveListener(TouchPointInfoPtr ti, XID resource);
extern void TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti,
InternalEvent *ev);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:19:47 +0000