diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-29 13:52:54 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-29 13:52:54 +0000 |
| commit | adedeafd2115e1648d7c702e8f5c215040ee417d (patch) | |
| tree | 43f432acd6ca46dde5b38cec492e510afe0c3c9e | |
| parent | 06e5c90504a3b702b24ec70073d52027de4b5c2b (diff) | |
| download | xorg-lib-libX11-adedeafd2115e1648d7c702e8f5c215040ee417d.tar.gz | |
fix bad merge
| -rw-r--r-- | include/X11/Xlib.h | 6 | ||||
| -rw-r--r-- | include/X11/Xlibint.h | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index 79328ec4..f3aae5a7 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -3830,12 +3830,6 @@ extern char *XSetIMValues( XIM /* im */, ... ); -extern char *XSetIMValues( -#if NeedVarargsPrototypes - XIM /* im */, ... -#endif -); - extern Display *XDisplayOfIM( XIM /* im */ ); diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h index 8ebca897..007c4477 100644 --- a/include/X11/Xlibint.h +++ b/include/X11/Xlibint.h @@ -1020,12 +1020,6 @@ extern int _XFreeExtData( XExtData* /* extension */ ); -extern Bool _XWireToEvent(Display *dpy, XEvent *re, xEvent *event); -extern Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we); -extern Bool _XPollfdCacheInit(Display *dpy); -extern XID _XAllocID(Display *dpy); -extern void _XAllocIDs(Display *dpy, XID *ids, int count); - extern int (*XESetCreateGC( Display* /* display */, int /* extension */, |