summaryrefslogtreecommitdiff
path: root/src/XShm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/XShm.c')
-rw-r--r--src/XShm.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/src/XShm.c b/src/XShm.c
index 4bdea55..b91c0ba 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -25,16 +25,18 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Bob Scheifler and Keith Packard, MIT X Consortium
*/
+/* $XFree86: xc/lib/Xext/XShm.c,v 1.6 2002/10/16 02:19:22 dawes Exp $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
#define NEED_EVENTS
#define NEED_REPLIES
-#include "Xlibint.h"
-#include "XShm.h"
-#include "shmstr.h"
-#include "Xext.h"
-#include "extutil.h"
+#include <stdio.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XShm.h>
+#include <X11/extensions/shmstr.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
static XExtensionInfo _shm_info_data;
static XExtensionInfo *shm_info = &_shm_info_data;
@@ -49,10 +51,16 @@ static /* const */ char *shm_extension_name = SHMNAME;
* *
*****************************************************************************/
-static int close_display();
-static char *error_string();
-static Bool wire_to_event();
-static Status event_to_wire();
+/* in X11/ImUtil.c */
+extern int _XGetScanlinePad();
+extern int _XGetBitsPerPixel();
+extern void _XInitImageFuncPtrs();
+
+static int close_display(Display *dpy, XExtCodes *codes);
+static char *error_string(Display *dpy, int code, XExtCodes *codes,
+ char *buf, int n);
+static Bool wire_to_event (Display *dpy, XEvent *re, xEvent *event);
+static Status event_to_wire (Display *dpy, XEvent *re, xEvent *event);
static /* const */ XExtensionHooks shm_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -80,10 +88,8 @@ static XEXT_GENERATE_ERROR_STRING (error_string, shm_extension_name,
ShmNumberErrors, shm_error_list)
-static Bool wire_to_event (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
+static Bool
+wire_to_event (Display *dpy, XEvent *re, xEvent *event)
{
XExtDisplayInfo *info = find_display (dpy);
XShmCompletionEvent *se;
@@ -109,10 +115,8 @@ static Bool wire_to_event (dpy, re, event)
return False;
}
-static Status event_to_wire (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
+static Status
+event_to_wire (Display *dpy, XEvent *re, xEvent *event)
{
XExtDisplayInfo *info = find_display (dpy);
XShmCompletionEvent *se;