fix conflicts between declarations

Author: John-Colvin

deimos/X11/Xlibint.d

@@ -12,7 +12,7 @@ import core.stdc.stdio : fopen;
 import core.stdc.config;
 import core.stdc.stdlib : free, malloc, calloc, realloc;
 
-import deimos.X11.X    :   XID;
+import deimos.X11.X    :   XID, GContext, KeySym, Font, VisualID, Window;
 import deimos.X11.Xmd  : CARD32;
 import deimos.X11.Xlib :   _XrmHashBucketRec, Bool,Screen, ScreenFormat, Status, Visual, XChar2b, XCharStruct,
                     XConnectionWatchProc, XEvent, XErrorEvent, XExtCodes, XExtData, XFontStruct, XGCValues,

deimos/X11/Xmd.d

@@ -51,7 +51,7 @@ alias _SIZEOF SIZEOF;
  * need them.  Note that bitfields are not guaranteed to be signed
  * (or even unsigned) according to ANSI C.
  */
-version( X86_64 ){
+version( WORD64 ){
     alias long INT64;
     alias c_ulong CARD64;
     //~ #  define B32 :32

deimos/X11/Xproto.d

@@ -171,18 +171,20 @@ 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.  */
 
-alias CARD32    Window;
-alias CARD32    Drawable;
-alias CARD32    Font;
-alias CARD32    Pixmap;
-alias CARD32    Cursor;
-alias CARD32    Colormap;
-alias CARD32    GContext;
-alias CARD32    Atom;
-alias CARD32    VisualID;
-alias CARD32    Time;
-alias CARD8     KeyCode;
-alias CARD32    KeySym;
+private{
+    alias CARD32    Window;
+    alias CARD32    Drawable;
+    alias CARD32    Font;
+    alias CARD32    Pixmap;
+    alias CARD32    Cursor;
+    alias CARD32    Colormap;
+    alias CARD32    GContext;
+    alias CARD32    Atom;
+    alias CARD32    VisualID;
+    alias CARD32    Time;
+    alias CARD8     KeyCode;
+    alias CARD32    KeySym;
+}
 
 enum X_TCP_PORT = 6000;                            /* add display number                                           */