summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-07 18:34:54 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-07 18:34:54 -0800
commit8f22f7b03787dd948959b53f103307148ce5bee4 (patch)
tree037cb0bbec7d97035d9b0bab4660d85c3792de61
parent9d38df5837a9a2570f974e2d6209cc775a14743b (diff)
Revert previous struct changes to the userland applewm.h
-rw-r--r--applewm.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/applewm.h b/applewm.h
index 2e9f669..679a4b3 100644
--- a/applewm.h
+++ b/applewm.h
@@ -122,24 +122,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _APPLEWM_SERVER_
-/* For the purpose of the structure definitions in this file,
-we must redefine the following types in terms of Xmd.h's types, which may
-include bit fields. All of these are #undef'd at the end of this file,
-restoring the definitions in X.h. */
-
-#define Window CARD32
-#define Drawable CARD32
-#define Font CARD32
-#define Pixmap CARD32
-#define Cursor CARD32
-#define Colormap CARD32
-#define GContext CARD32
-#define Atom CARD32
-#define VisualID CARD32
-#define Time CARD32
-#define KeyCode CARD8
-#define KeySym CARD32
-
typedef struct {
int type; /* of event */
unsigned long serial; /* # of last request processed by server */
@@ -205,19 +187,5 @@ Bool XAppleWMFrameDraw (Display *dpy, int screen, Window window,
_XFUNCPROTOEND
-/* restore these definitions back to the typedefs in X.h */
-#undef Window
-#undef Drawable
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef Atom
-#undef VisualID
-#undef Time
-#undef KeyCode
-#undef KeySym
-
#endif /* _APPLEWM_SERVER_ */
#endif /* _APPLEWM_H_ */