diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-06-02 21:54:12 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-06-02 21:54:12 +0200 |
| commit | b5d78278debb1006eaf63d460f9bd6082fa3f860 (patch) | |
| tree | 478fe2034ac0330811f9d4a396295c12e6a87977 /nx-X11/include/extensions | |
| parent | 167d09ed740529bc43c1b32a34e80be12c6eb257 (diff) | |
| parent | 6a74e671af51a2afdade8d1fc8ca0ca2ad5c536c (diff) | |
| download | nx-libs-b5d78278debb1006eaf63d460f9bd6082fa3f860.tar.gz nx-libs-b5d78278debb1006eaf63d460f9bd6082fa3f860.tar.bz2 nx-libs-b5d78278debb1006eaf63d460f9bd6082fa3f860.zip | |
Merge branch 'sunweaver-pr/libxres-cleanup' into arctica-3.6.x
Attributes GH PR #39: https://github.com/ArcticaProject/nx-libs/pull/39
Diffstat (limited to 'nx-X11/include/extensions')
| -rw-r--r-- | nx-X11/include/extensions/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/include/extensions/XRes.h | 58 |
2 files changed, 2 insertions, 60 deletions
diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 549c77018..68198698f 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -54,8 +54,8 @@ COMPOSITEHEADERS = composite.h compositeproto.h XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \ xtraplibp.h xtrapproto.h #endif -#if BuildXResExt || BuildXResLibrary -XRESHEADERS = XRes.h XResproto.h +#if BuildXResExt +XRESHEADERS = XResproto.h #endif #if BuildXevie XEVIEHEADERS = Xevie.h Xeviestr.h diff --git a/nx-X11/include/extensions/XRes.h b/nx-X11/include/extensions/XRes.h deleted file mode 100644 index 99a364339..000000000 --- a/nx-X11/include/extensions/XRes.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - Copyright (c) 2002 XFree86 Inc -*/ -/* $XdotOrg: xc/include/extensions/XRes.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */ -/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */ - -#ifndef _XRES_H -#define _XRES_H - -#include <X11/Xfuncproto.h> - -typedef struct { - XID resource_base; - XID resource_mask; -} XResClient; - -typedef struct { - Atom resource_type; - unsigned int count; -} XResType; - -_XFUNCPROTOBEGIN - - -Bool XResQueryExtension ( - Display *dpy, - int *event_base, - int *error_base -); - -Status XResQueryVersion ( - Display *dpy, - int *major_versionp, - int *minor_versionp -); - -Status XResQueryClients ( - Display *dpy, - int *num_clients, - XResClient **clients -); - -Status XResQueryClientResources ( - Display *dpy, - XID xid, - int *num_types, - XResType **types -); - -Status XResQueryClientPixmapBytes ( - Display *dpy, - XID xid, - unsigned long *bytes -); - -_XFUNCPROTOEND - -#endif /* _XRES_H */ |