diff options
Diffstat (limited to 'libXext')
| -rw-r--r-- | libXext/include/X11/extensions/extutil.h | 1 | ||||
| -rw-r--r-- | libXext/src/XAppgroup.c | 4 | ||||
| -rw-r--r-- | libXext/src/eat.h | 4 | ||||
| -rw-r--r-- | libXext/src/libXext.def | 8 | ||||
| -rw-r--r-- | libXext/src/makefile | 30 |
5 files changed, 45 insertions, 2 deletions
diff --git a/libXext/include/X11/extensions/extutil.h b/libXext/include/X11/extensions/extutil.h index b22843068..074cc183a 100644 --- a/libXext/include/X11/extensions/extutil.h +++ b/libXext/include/X11/extensions/extutil.h @@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ +#include <unistd.h> #include <X11/extensions/Xext.h> /* 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/libXext/src/eat.h b/libXext/src/eat.h index 239532b6d..38d782949 100644 --- a/libXext/src/eat.h +++ b/libXext/src/eat.h @@ -29,6 +29,10 @@ #include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */ #include <limits.h> +#ifdef _MSC_VER +#define inline __inline +#endif + static inline void _XEatDataWords(Display *dpy, unsigned long n) { # ifndef LONG64 diff --git a/libXext/src/libXext.def b/libXext/src/libXext.def new file mode 100644 index 000000000..ceb636cf9 --- /dev/null +++ b/libXext/src/libXext.def @@ -0,0 +1,8 @@ +LIBRARY libXext
+EXPORTS
+ XSecurityGenerateAuthorization
+ XSecurityFreeXauth
+ XSecurityQueryExtension
+ XSecurityAllocXauth
+ XShapeCombineMask
+ XShapeQueryExtension
\ No newline at end of file diff --git a/libXext/src/makefile b/libXext/src/makefile new file mode 100644 index 000000000..23d2a0946 --- /dev/null +++ b/libXext/src/makefile @@ -0,0 +1,30 @@ +SHAREDLIB = libXext + +INCLUDES := ..\include $(INCLUDES) + +INCLUDELIBFILES = \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib + +LIBDIRS=$(dir $(INCLUDELIBFILES)) + +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) + + +CSRCS = \ + DPMS.c \ + MITMisc.c \ + XAppgroup.c \ + XEVI.c \ + XLbx.c \ + XMultibuf.c \ + XSecurity.c \ + XShape.c \ + XShm.c \ + XSync.c \ + XTestExt1.c \ + Xcup.c \ + Xdbe.c \ + Xge.c \ + extutil.c \ + globals.c + |