ref: e4e6ac8ef4a16b64203f40ef50a2afd9f5e0f3d5
parent: 95f75a8ea984c0b0939ca042363e58b673c6e120
author: Roberto E. Vargas Caballero <[email protected]>
date: Mon Sep 9 12:55:26 EDT 2019
Fix amd64 equis port
--- a/sys/include/ape/X11/Xpoll.h
+++ b/sys/include/ape/X11/Xpoll.h
@@ -158,9 +158,6 @@
* array. before accessing an element in the array we check it exists.
* If it does not exist then the compiler discards the code to access it.
*/
-#ifdef PLAN9
-#define XFD_ANYSET FD_ANYSET
-#else
#define XFD_ANYSET(p) \
((howmany(FD_SETSIZE, NFDBITS) > 0 && (__XFDS_BITS(p, 0))) || \
(howmany(FD_SETSIZE, NFDBITS) > 1 && (__XFDS_BITS(p, 1))) || \
@@ -171,7 +168,6 @@
(howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
(howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
-#endif /* PLAN9 */
#define XFD_COPYSET(src,dst) { \int __i__; \
--- a/sys/include/ape/X11/Xproto.h
+++ b/sys/include/ape/X11/Xproto.h
@@ -267,6 +267,8 @@
numRoots xWindowRoot structs.
*****************/
+#pragma pack on
+
typedef struct {CARD8 byteOrder;
BYTE pad;
@@ -1277,7 +1279,7 @@
/* Request structure */
-
+#pragma pack on
typedef struct _xReq {CARD8 reqType;
CARD8 data; /* meaning depends on request type */
@@ -2126,4 +2128,5 @@
#undef KeyCode
#undef KeySym
+#pragma pack off
#endif /* XPROTO_H */
--- a/sys/include/ape/X11/Xprotostr.h
+++ b/sys/include/ape/X11/Xprotostr.h
@@ -1,7 +1,7 @@
/* $Xorg: Xprotostr.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
#ifndef XPROTOSTRUCTS_H
#define XPROTOSTRUCTS_H
-
+#pragma pack on
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -75,4 +75,5 @@
INT16 angle1 B16, angle2 B16;
} xArc;
+#pragma pack off
#endif /* XPROTOSTRUCTS_H */
--- a/sys/include/ape/X11/Xtrans/Xtranssock.c
+++ b/sys/include/ape/X11/Xtrans/Xtranssock.c
@@ -295,7 +295,6 @@
#endif
-#define EWOULDBLOCK EAGAIN
/*
* These are some utility function used by the real interface function below.
--- a/sys/include/ape/X11/extensions/Printstr.h
+++ b/sys/include/ape/X11/extensions/Printstr.h
@@ -126,7 +126,9 @@
* constants where ABC is the name of the protocol request.
*/
+#pragma pack on
+
/*********************************************************************
*
* Events.
@@ -652,6 +654,8 @@
CARD32 pad6 B32;
} xPrintGetImageResolutionReply;
#define sz_xPrintGetImageResolutionReply 32
+
+#pragma pack off
#ifndef _XP_PRINT_SERVER_
/***********************************************************************
--- a/sys/include/ape/X11/extensions/XEVIstr.h
+++ b/sys/include/ape/X11/extensions/XEVIstr.h
@@ -36,6 +36,8 @@
typedef CARD32 VisualID32;
#define sz_VisualID32 4
+#pragma pack on
+
typedef struct _xExtendedVisualInfo {VisualID core_visual_id B32;
INT8 screen;
@@ -92,6 +94,8 @@
CARD32 pad3 B32;
} xEVIGetVisualInfoReply;
#define sz_xEVIGetVisualInfoReply 32
+
+#pragma pack off
#undef VisualID
--- a/sys/include/ape/X11/extensions/XKBproto.h
+++ b/sys/include/ape/X11/extensions/XKBproto.h
@@ -39,6 +39,8 @@
#define XkbPaddedSize(n) ((((unsigned int)(n)+3) >> 2) << 2)
+#pragma pack on
+
typedef struct _xkbUseExtension {CARD8 reqType;
CARD8 xkbReqType; /* always X_KBUseExtension */
@@ -1278,5 +1280,7 @@
#undef Time
#undef KeyCode
#undef KeySym
+
+#pragma pack off
#endif /* _XKBPROTO_H_ */
--- a/sys/include/ape/X11/extensions/XKMformat.h
+++ b/sys/include/ape/X11/extensions/XKMformat.h
@@ -33,6 +33,8 @@
#include <X11/extensions/XKBproto.h>
#include <X11/extensions/XKM.h>
+#pragma pack on
+
typedef struct _xkmFileInfo {CARD8 type;
CARD8 min_kc;
@@ -297,5 +299,7 @@
xkmLogoDoodadDesc logo;
} xkmDoodadDesc;
#define sz_xkmDoodadDesc 16
+
+#pragma pack off
#endif /* _XKMFORMAT_H_ */
--- a/sys/include/ape/X11/extensions/XResproto.h
+++ b/sys/include/ape/X11/extensions/XResproto.h
@@ -16,6 +16,8 @@
#define X_XResQueryClientResources 2
#define X_XResQueryClientPixmapBytes 3
+#pragma pack on
+
typedef struct {CARD32 resource_base;
CARD32 resource_mask;
@@ -126,5 +128,6 @@
} xXResQueryClientPixmapBytesReply;
#define sz_xXResQueryClientPixmapBytesReply 32
+#pragma pack off
#endif /* _XRESPROTO_H */
--- a/sys/include/ape/X11/extensions/Xagstr.h
+++ b/sys/include/ape/X11/extensions/Xagstr.h
@@ -54,6 +54,8 @@
#define Colormap CARD32
#define VisualID CARD32
#define Window CARD32
+
+#pragma pack on
typedef struct _XagQueryVersion {CARD8 reqType; /* always XagReqCode */
@@ -178,6 +180,8 @@
#undef Window
#undef Colormap
#undef VisualID
+
+#pragma pack off
#endif /* } _XAGSTR_H_ */
--- a/sys/include/ape/X11/extensions/Xcupstr.h
+++ b/sys/include/ape/X11/extensions/Xcupstr.h
@@ -38,6 +38,8 @@
#define XCUP_MAJOR_VERSION 1 /* current version numbers */
#define XCUP_MINOR_VERSION 0
+#pragma pack on
+
typedef struct _XcupQueryVersion {CARD8 reqType; /* always XcupReqCode */
CARD8 xcupReqType; /* always X_XcupQueryVersion */
@@ -105,6 +107,8 @@
CARD32 pad7 B32;
} xXcupStoreColorsReply;
#define sz_xXcupStoreColorsReply 32
+
+#pragma pack off
#endif /* } _XCUPSTR_H_ */
--- a/sys/include/ape/X11/extensions/Xdbeproto.h
+++ b/sys/include/ape/X11/extensions/Xdbeproto.h
@@ -104,6 +104,8 @@
#ifdef NEED_DBE_PROTOCOL
+#pragma pack on
+
typedef struct
{CARD32 window B32; /* window */
@@ -271,6 +273,8 @@
} xDbeGetBackBufferAttributesReply;
#define sz_xDbeGetBackBufferAttributesReply 32
+
+#pragma pack off
#endif /* NEED_DBE_PROTOCOL */
--- a/sys/include/ape/X11/extensions/Xeviestr.h
+++ b/sys/include/ape/X11/extensions/Xeviestr.h
@@ -48,6 +48,8 @@
#define XevieNumberErrors 0
+#pragma pack on
+
typedef struct _XevieQueryVersion { CARD8 reqType;
CARD8 xevieReqType;
@@ -160,6 +162,7 @@
CARD32 pad7 B32;
} xXevieSelectInputReply;
#define sz_xXevieSelectInputReply 32
+#pragma pack off
#endif /* } _XEVIESTR_H_ */
--- a/sys/include/ape/X11/extensions/XvMCproto.h
+++ b/sys/include/ape/X11/extensions/XvMCproto.h
@@ -17,6 +17,7 @@
#define xvmcNumRequest (xvmc_LastRequest + 1)
+#pragma pack on
typedef struct {CARD32 surface_type_id B32;
@@ -224,5 +225,7 @@
CARD32 isLocal B32;
} xvmcGetDRInfoReply;
#define sz_xvmcGetDRInfoReply 32
+
+#pragma pack off
#endif
--- a/sys/include/ape/X11/extensions/Xvproto.h
+++ b/sys/include/ape/X11/extensions/Xvproto.h
@@ -65,6 +65,8 @@
/* Structures */
+#pragma pack on
+
typedef struct {INT32 numerator B32;
INT32 denominator B32;
@@ -599,6 +601,8 @@
#undef GContext
#undef Time
#undef Atom
+
+#pragma pack off
#endif /* XVPROTO_H */
--- a/sys/include/ape/X11/extensions/bigreqstr.h
+++ b/sys/include/ape/X11/extensions/bigreqstr.h
@@ -37,6 +37,8 @@
#define XBigReqExtensionName "BIG-REQUESTS"
+#pragma pack on
+
typedef struct {CARD8 reqType; /* always XBigReqCode */
CARD8 brReqType; /* always X_BigReqEnable */
@@ -65,5 +67,7 @@
CARD16 zero B16;
CARD32 length B32;
} xBigReq;
+
+#pragma pack off
#endif /* _BIGREQSTR_H_ */
--- a/sys/include/ape/X11/extensions/compositeproto.h
+++ b/sys/include/ape/X11/extensions/compositeproto.h
@@ -52,6 +52,8 @@
#define Window CARD32
#define Region CARD32
+#pragma pack on
+
/*
* requests and replies
*/
@@ -187,5 +189,7 @@
#undef Window
#undef Region
+
+#pragma pack off
#endif /* _COMPOSITEPROTO_H_ */
--- a/sys/include/ape/X11/extensions/damageproto.h
+++ b/sys/include/ape/X11/extensions/damageproto.h
@@ -46,6 +46,8 @@
#define Region CARD32
#define Damage CARD32
+#pragma pack on
+
/************** Version 0 ******************/
typedef struct {@@ -156,5 +158,7 @@
#undef Time
#undef KeyCode
#undef KeySym
+
+#pragma pack off
#endif /* _DAMAGEPROTO_H_ */
--- a/sys/include/ape/X11/extensions/dmxproto.h
+++ b/sys/include/ape/X11/extensions/dmxproto.h
@@ -71,6 +71,8 @@
#define X_DMXAddInput 16
#define X_DMXRemoveInput 17
+#pragma pack on
+
/** Wire-level description of DMXQueryVersion protocol request. */
typedef struct {CARD8 reqType; /* dmxcode */
@@ -442,5 +444,7 @@
CARD32 pad4 B32;
} xDMXRemoveInputReply;
#define sz_xDMXRemoveInputReply 32
+
+#pragma pack off
#endif
--- a/sys/include/ape/X11/extensions/dpmsstr.h
+++ b/sys/include/ape/X11/extensions/dpmsstr.h
@@ -56,6 +56,8 @@
#define DPMSExtensionName "DPMS"
+#pragma pack on
+
typedef struct {CARD8 reqType; /* always DPMSCode */
CARD8 dpmsReqType; /* always X_DPMSGetVersion */
@@ -182,5 +184,7 @@
CARD32 pad6 B32;
} xDPMSInfoReply;
#define sz_xDPMSInfoReply 32
+
+#pragma pack off
#endif /* _DPMSSTR_H_ */
--- a/sys/include/ape/X11/extensions/fontcachstr.h
+++ b/sys/include/ape/X11/extensions/fontcachstr.h
@@ -41,6 +41,8 @@
#define FONTCACHE_MAJOR_VERSION 0 /* current version numbers */
#define FONTCACHE_MINOR_VERSION 1
+#pragma pack on
+
typedef struct _FontCacheQueryVersion {CARD8 reqType; /* always FontCacheReqCode */
CARD8 fontcacheReqType; /* always X_FontCacheQueryVersion */
@@ -126,5 +128,7 @@
CARD32 v_reserve0 B32;
} xFontCacheGetCacheStatisticsReply;
#define sz_xFontCacheGetCacheStatisticsReply 64
+
+#pragma pack off
#endif /* _FONTCACHESTR_H_ */
--- a/sys/include/ape/X11/extensions/lbxstr.h
+++ b/sys/include/ape/X11/extensions/lbxstr.h
@@ -45,6 +45,8 @@
#define VisualID CARD32
#define Window CARD32
+#pragma pack on
+
typedef struct {BOOL success; /* TRUE */
BOOL changeType;
@@ -931,5 +933,7 @@
#undef Drawable
#undef VisualID
#undef Window
+
+#pragma pack off
#endif /* _LBXSTR_H_ */
--- a/sys/include/ape/X11/extensions/mitmiscstr.h
+++ b/sys/include/ape/X11/extensions/mitmiscstr.h
@@ -36,6 +36,8 @@
#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+#pragma pack on
+
typedef struct _SetBugMode {CARD8 reqType; /* always MITReqCode */
CARD8 mitReqType; /* always X_MITSetBugMode */
@@ -66,5 +68,7 @@
CARD32 pad5 B32;
} xMITGetBugModeReply;
#define sz_xMITGetBugModeReply 32
+
+#pragma pack off
#endif /* _MITMISCSTR_H_ */
--- a/sys/include/ape/X11/extensions/multibufst.h
+++ b/sys/include/ape/X11/extensions/multibufst.h
@@ -53,6 +53,8 @@
#define VisualID CARD32
#define Multibuffer CARD32
+#pragma pack on
+
typedef struct xMbufBufferInfo {CARD32 visualID B32; /* associated visual */
CARD16 maxBuffers B16; /* maximum supported buffers */
@@ -296,6 +298,7 @@
#undef VisualID
#undef Multibuffer
+#pragma pack off
#ifdef _MULTIBUF_SERVER_
/* Macros for wrapping and unwrapping functions */
--- a/sys/include/ape/X11/extensions/panoramiXproto.h
+++ b/sys/include/ape/X11/extensions/panoramiXproto.h
@@ -40,6 +40,8 @@
#define X_XineramaIsActive 4
#define X_XineramaQueryScreens 5
+#pragma pack on
+
typedef struct _PanoramiXQueryVersion {CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXQueryVersion */
@@ -188,5 +190,7 @@
CARD16 height B16;
} xXineramaScreenInfo;
#define sz_XineramaScreenInfo 8
+
+#pragma pack off
#endif
--- a/sys/include/ape/X11/extensions/randrproto.h
+++ b/sys/include/ape/X11/extensions/randrproto.h
@@ -56,6 +56,8 @@
* data structures
*/
+#pragma pack on
+
typedef struct {CARD16 widthInPixels B16;
CARD16 heightInPixels B16;
@@ -646,5 +648,7 @@
#undef Rotation
#undef SizeID
#undef SubpixelOrder
+
+#pragma pack off
#endif /* _XRANDRP_H_ */
--- a/sys/include/ape/X11/extensions/recordstr.h
+++ b/sys/include/ape/X11/extensions/recordstr.h
@@ -80,6 +80,8 @@
typedef RECORD_CLIENTSPEC RecordClientSpec, *RecordClientSpecPtr;
+#pragma pack on
+
typedef struct
{CARD8 first;
@@ -318,5 +320,7 @@
#undef RECORD_XIDBASE
#undef RECORD_ELEMENT_HEADER
#undef RECORD_CLIENTSPEC
+
+#pragma pack off
#endif
--- a/sys/include/ape/X11/extensions/renderproto.h
+++ b/sys/include/ape/X11/extensions/renderproto.h
@@ -51,6 +51,8 @@
* data structures
*/
+#pragma pack on
+
typedef struct {CARD16 red B16;
CARD16 redMask B16;
@@ -659,5 +661,7 @@
#undef PictFormat
#undef Fixed
#undef Glyphset
+
+#pragma pack off
#endif /* _XRENDERP_H_ */
--- a/sys/include/ape/X11/extensions/saverproto.h
+++ b/sys/include/ape/X11/extensions/saverproto.h
@@ -46,6 +46,8 @@
#define KeyCode CARD8
#define KeySym CARD32
+#pragma pack on
+
#define X_ScreenSaverQueryVersion 0
typedef struct _ScreenSaverQueryVersion {@@ -174,5 +176,7 @@
#undef Time
#undef KeyCode
#undef KeySym
+
+#pragma pack off
#endif /* _SAVERPROTO_H_ */
--- a/sys/include/ape/X11/extensions/securstr.h
+++ b/sys/include/ape/X11/extensions/securstr.h
@@ -39,6 +39,8 @@
#define X_SecurityGenerateAuthorization 1
#define X_SecurityRevokeAuthorization 2
+#pragma pack on
+
typedef struct {CARD8 reqType;
CARD8 securityReqType;
@@ -112,5 +114,7 @@
CARD32 pad5 B32;
} xSecurityAuthorizationRevokedEvent;
#define sz_xSecurityAuthorizationRevokedEvent 32
+
+#pragma pack off
#endif /* _SECURSTR_H */
--- a/sys/include/ape/X11/extensions/shapestr.h
+++ b/sys/include/ape/X11/extensions/shapestr.h
@@ -44,6 +44,8 @@
#define SHAPE_MAJOR_VERSION 1 /* current version numbers */
#define SHAPE_MINOR_VERSION 1
+#pragma pack on
+
typedef struct _ShapeQueryVersion {CARD8 reqType; /* always ShapeReqCode */
CARD8 shapeReqType; /* always X_ShapeQueryVersion */
@@ -230,5 +232,7 @@
#undef Window
#undef Time
+
+#pragma pack off
#endif /* _SHAPESTR_H_ */
--- a/sys/include/ape/X11/extensions/shmstr.h
+++ b/sys/include/ape/X11/extensions/shmstr.h
@@ -74,6 +74,8 @@
} ShmFuncs, *ShmFuncsPtr;
#endif
+#pragma pack on
+
typedef struct _ShmQueryVersion {CARD8 reqType; /* always ShmReqCode */
CARD8 shmReqType; /* always X_ShmQueryVersion */
@@ -213,5 +215,7 @@
#undef VisualID
#undef GContext
#undef Pixmap
+
+#pragma pack off
#endif /* _SHMSTR_H_ */
--- a/sys/include/ape/X11/extensions/syncstr.h
+++ b/sys/include/ape/X11/extensions/syncstr.h
@@ -64,6 +64,8 @@
#define XSyncCounter CARD32
#define XSyncAlarm CARD32
+#pragma pack on
+
/*
* Initialize
*/
@@ -362,6 +364,8 @@
#undef XSyncCounter
#undef XSyncAlarm
+
+#pragma pack off
#endif /* _SYNC_OS */
--- a/sys/include/ape/X11/extensions/xcmiscstr.h
+++ b/sys/include/ape/X11/extensions/xcmiscstr.h
@@ -42,6 +42,8 @@
#define XCMiscExtensionName "XC-MISC"
+#pragma pack on
+
typedef struct {CARD8 reqType; /* always XCMiscCode */
CARD8 miscReqType; /* always X_XCMiscGetVersion */
@@ -108,5 +110,7 @@
CARD32 pad5 B32;
} xXCMiscGetXIDListReply;
#define sz_xXCMiscGetXIDListReply 32
+
+#pragma pack off
#endif /* _XCMISCSTR_H_ */
--- a/sys/include/ape/X11/extensions/xf86bigfstr.h
+++ b/sys/include/ape/X11/extensions/xf86bigfstr.h
@@ -18,6 +18,8 @@
#define XF86BIGFONT_MAJOR_VERSION 1 /* current version numbers */
#define XF86BIGFONT_MINOR_VERSION 1
+#pragma pack on
+
typedef struct _XF86BigfontQueryVersion {CARD8 reqType; /* always XF86BigfontReqCode */
CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryVersion */
@@ -89,5 +91,7 @@
/* Bit masks that can be set in the flags */
#define XF86Bigfont_FLAGS_Shm 1
+
+#pragma pack off
#endif /* _XF86BIGFSTR_H_ */
--- a/sys/include/ape/X11/extensions/xf86dga1str.h
+++ b/sys/include/ape/X11/extensions/xf86dga1str.h
@@ -9,6 +9,8 @@
#ifndef _XF86DGASTR1_H_
#define _XF86DGASTR1_H_
+#pragma pack on
+
typedef struct _XF86DGAQueryVersion {CARD8 reqType; /* always DGAReqCode */
CARD8 dgaReqType; /* always X_DGAQueryVersion */
@@ -190,5 +192,6 @@
} xXF86DGAViewPortChangedReply;
#define sz_xXF86DGAViewPortChangedReply 32
-#endif /* _XF86DGASTR1_H_ */
+#pragma pack off
+#endif /* _XF86DGASTR1_H_ */
--- a/sys/include/ape/X11/extensions/xf86dgastr.h
+++ b/sys/include/ape/X11/extensions/xf86dgastr.h
@@ -16,6 +16,7 @@
#define XDGA_MAJOR_VERSION 2 /* current version numbers */
#define XDGA_MINOR_VERSION 0
+#pragma pack on
typedef struct _XDGAQueryVersion {CARD8 reqType; /* always DGAReqCode */
@@ -339,6 +340,7 @@
} u;
} dgaEvent;
+#pragma pack off
#endif /* _XF86DGASTR_H_ */
--- a/sys/include/ape/X11/extensions/xf86mscstr.h
+++ b/sys/include/ape/X11/extensions/xf86mscstr.h
@@ -16,6 +16,8 @@
#define XF86MISC_MAJOR_VERSION 0 /* current version numbers */
#define XF86MISC_MINOR_VERSION 9
+#pragma pack on
+
typedef struct _XF86MiscQueryVersion {CARD8 reqType; /* always XF86MiscReqCode */
CARD8 xf86miscReqType; /* always X_XF86MiscQueryVersion */
@@ -234,5 +236,7 @@
CARD32 pad6 B32;
} xXF86MiscPassMessageReply;
#define sz_xXF86MiscPassMessageReply 32
+
+#pragma pack off
#endif /* _XF86MISCSTR_H_ */
--- a/sys/include/ape/X11/extensions/xf86rushstr.h
+++ b/sys/include/ape/X11/extensions/xf86rushstr.h
@@ -15,6 +15,8 @@
#define XF86RUSH_MAJOR_VERSION 1 /* current version numbers */
#define XF86RUSH_MINOR_VERSION 1
+#pragma pack on
+
typedef struct _XF86RushQueryVersion {CARD8 reqType; /* always RushReqCode */
CARD8 rushReqType; /* always X_RushQueryVersion */
@@ -159,5 +161,7 @@
CARD16 pad B16;
} xXF86RushAT3DDisableRegsReq;
#define sz_xXF86RushAT3DDisableRegsReq 8
+
+#pragma pack off
#endif /* _XF86RUSHSTR_H_ */
--- a/sys/include/ape/X11/extensions/xf86vmstr.h
+++ b/sys/include/ape/X11/extensions/xf86vmstr.h
@@ -48,6 +48,8 @@
* major version 2 == uses new protocol version in XFree86 4.0.
*/
+#pragma pack on
+
typedef struct _XF86VidModeQueryVersion {CARD8 reqType; /* always XF86VidModeReqCode */
CARD8 xf86vidmodeReqType; /* always X_XF86VidModeQueryVersion */
@@ -557,6 +559,7 @@
} xXF86VidModeGetPermissionsReply;
#define sz_xXF86VidModeGetPermissionsReply 32
+#pragma pack off
#endif /* _XF86VIDMODESTR_H_ */
--- a/sys/include/ape/X11/extensions/xfixesproto.h
+++ b/sys/include/ape/X11/extensions/xfixesproto.h
@@ -67,6 +67,8 @@
/*************** Version 1 ******************/
+#pragma pack on
+
typedef struct {CARD8 reqType;
CARD8 xfixesReqType;
@@ -516,5 +518,7 @@
#undef Time
#undef KeyCode
#undef KeySym
+
+#pragma pack off
#endif /* _XFIXESPROTO_H_ */
--- a/sys/include/ape/X11/extensions/xtestext1.h
+++ b/sys/include/ape/X11/extensions/xtestext1.h
@@ -109,6 +109,8 @@
*/
#define XTestMAX_ACTION_LIST_SIZE 64
+#pragma pack on
+
typedef struct {CARD8 reqType; /* always XTestReqCode */
CARD8 XTestReqType; /* always X_TestFakeInput */
@@ -198,6 +200,8 @@
CARD32 pad07 B32;
CARD32 pad08 B32;
} xTestFakeAckEvent;
+
+#pragma pack off
/*
* The server side of this extension does not (and should not) have
--- a/sys/include/ape/X11/extensions/xteststr.h
+++ b/sys/include/ape/X11/extensions/xteststr.h
@@ -34,6 +34,8 @@
#define XTestCurrentCursor ((Cursor)1)
+#pragma pack on
+
typedef struct {CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestGetVersion */
@@ -116,5 +118,7 @@
#undef Window
#undef Time
#undef Cursor
+
+#pragma pack off
#endif /* _XTESTSTR_H_ */
--- a/sys/include/ape/X11/extensions/xtrapdi.h
+++ b/sys/include/ape/X11/extensions/xtrapdi.h
@@ -183,6 +183,8 @@
#define XETrap_GetVersion 8L /* Get (Just) Version */
#define XETrap_GetLastInpTime 9L /* Get Timestamp of last client input */
+#pragma pack on
+
/* The following are formats of a request to the XTRAP
* extension. The data-less XTrap requests all use xXTrapReq
*/
@@ -252,7 +254,9 @@
#define sz_xXTrapInputReq (sizeof(xXTrapInputReq))
#endif
+#pragma pack off
+
/* The following structures are used by the server extension to send
* information and replies to the client.
*/
@@ -344,6 +348,8 @@
#define PF_Sun386i 111L /* server on Sun 386i system */
#define PF_SunSparc 112L /* server on Sun Sparc system */
+#pragma pack on
+
/* reply sent back by XETrapGetAvailable request */
typedef struct
{@@ -449,6 +455,8 @@
/* the following works because all fields are defined as bit (Bnn) fields */
#define sz_XETrapHeader sizeof(XETrapHeader)
+#pragma pack off
+
#define XETrapHeaderIsEvent(phdr) (XETrapGetHeaderType(phdr) == 0x1L)
#define XETrapHeaderIsRequest(phdr) (XETrapGetHeaderType(phdr) == 0x2L)
#define XETrapHeaderIsSpecial(phdr) (XETrapGetHeaderType(phdr) == 0x3L)
@@ -468,6 +476,8 @@
} u;
} XETrapDatum;
+#pragma pack on
+
/* this doesn't get picked up for VMS server builds (different Xproto.h) */
#ifndef sz_xEvent
#define sz_xEvent 32
@@ -503,5 +513,7 @@
#define XEKeyIsClear 0
#define XEKeyIsEcho 1
#define XEKeyIsOther 2
+
+#pragma pack off
#endif /* __XTRAPDI__ */
--- a/sys/src/ape/X11/cmd/X/hw/equis/dix-config.h
+++ b/sys/src/ape/X11/cmd/X/hw/equis/dix-config.h
@@ -24,18 +24,16 @@
#ifndef _DIX_CONFIG_H_
#define _DIX_CONFIG_H_
-#if defined(T386) || defined(Tamd64) || defined(Talpha) || defined(Tarm)
#undef X_BYTE_ORDER
-#define X_BYTE_ORDER X_LITTLE_ENDIAN
-#define BITMAP_BIT_ORDER LSBFirst
-#define IMAGE_BYTE_ORDER LSBFirst
-#elif defined(Tmips) || defined(Tsparc) || defined(Tpower)
-#undef X_BYTE_ORDER
+
+#if defined(Tmips) || defined(Tsparc) || defined(Tpower)
#define X_BYTE_ORDER X_BIG_ENDIAN
#define BITMAP_BIT_ORDER MSBFirst
#define IMAGE_BYTE_ORDER MSBFirst
#else
-Error unknown byte order
+#define X_BYTE_ORDER X_LITTLE_ENDIAN
+#define BITMAP_BIT_ORDER LSBFirst
+#define IMAGE_BYTE_ORDER LSBFirst
#endif
#define ABORTONFATALERROR 1
@@ -94,7 +92,6 @@
#define USE_RGB_BUILTIN 1
#define XKB_DFLT_DISABLED 0
-#undef BIGREQS /*1*/
#undef BUILTIN_FONTS
#undef COMPOSITE /*1*/
#undef DAMAGE /*1*/
@@ -125,7 +122,6 @@
#undef XCSECURITY
#undef XDMCP
#undef XEVIE
-#undef XF86BIGFONT
#undef XF86DRI
#undef XF86MISC
#undef XF86VIDMODE
--- a/sys/src/ape/X11/cmd/X/os/log.c
+++ b/sys/src/ape/X11/cmd/X/os/log.c
@@ -264,10 +264,8 @@
vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
len = strlen(tmpBuffer);
}
-#ifndef PLAN9
if ((verb < 0 || logVerbosity >= verb) && len > 0)
fwrite(tmpBuffer, len, 1, stderr);
-#endif
if ((verb < 0 || logFileVerbosity >= verb) && len > 0) { if (logFile) {fwrite(tmpBuffer, len, 1, logFile);
--- a/sys/src/ape/X11/cmd/mkfile
+++ b/sys/src/ape/X11/cmd/mkfile
@@ -10,7 +10,7 @@
DIRS=\
# X\
twm\
- xclock\
+# xclock\
</sys/src/cmd/mkmany
--- a/sys/src/ape/X11/cmd/twm/session.c
+++ b/sys/src/ape/X11/cmd/twm/session.c
@@ -65,31 +65,6 @@
#include "screen.h"
#include "session.h"
-#ifdef PLAN9
-#define HAS_MKSTEMP
-int
-mkstemp(char *template)
-{- char *s;
- int i, fd;
-
- s = strdup(template);
- if(s == NULL)
- return -1;
- for(i=0; i<20; i++){- strcpy(s, template);
- mktemp(s);
- if((fd = creat(s, 0666)) >= 0){- strcpy(template, s);
- free(s);
- return fd;
- }
- }
- free(s);
- return -1;
-}
-#endif
-
SmcConn smcConn = NULL;
XtInputId iceInputId;
char *twm_clientId;
--- a/sys/src/ape/X11/config.h
+++ b/sys/src/ape/X11/config.h
@@ -1,16 +1,13 @@
#define PACKAGE "Equis"
-#if defined(T386) || defined(Talpha) || defined(Tarm)
-#undef WORDS_BIGENDIAN
-#define BYTE_ORDER LITTLE_ENDIAN
-#elif defined(Tmips) || defined(Tsparc)
-#define WORDS_BIGENDIAN || defined(Tpower)
+#if defined(Tmips) || defined(Tsparc) || defined(Tpower)
+#define WORDS_BIGENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
-Error unknown byte order
+#undef WORDS_BIGENDIAN
+#define BYTE_ORDER LITTLE_ENDIAN
#endif
-#define EWOULDBLOCK EAGAIN
#define HAVE_INTTYPES_H 1
#define HAVE_STDLIB_H 1
#define HAVE_STRING_H 1
@@ -19,8 +16,8 @@
#define HAVE_UNISTD_H 1
#define RETSIGTYPE void
#define STDC_HEADERS 1
+#define HAS_MKSTEMP
-
/* libXaw */
extern int _SLEEP(long);
#define usleep(x) _SLEEP((x)/1000)
@@ -58,8 +55,6 @@
#define X_GZIP_FONT_COMPRESSION 1
extern double hypot(double, double);
-#define INT32_MIN INT_MIN
-#define INT32_MAX INT_MAX
#include <limits.h>
/* libXmu */
--- a/sys/src/ape/X11/lib/Xaw/XawI18n.h
+++ b/sys/src/ape/X11/lib/Xaw/XawI18n.h
@@ -61,7 +61,7 @@
#endif
#endif
-#if defined(QNX4) || defined(PLAN9)
+#if defined(QNX4)
#define toascii( c ) ((unsigned)(c) & 0x007f)
#endif
--- a/sys/src/ape/X11/lib/Xfont/Speedo/do_char.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/do_char.c
@@ -35,7 +35,6 @@
#endif
#include "spdo_prv.h" /* General definitions for Speedo */
-#define DEBUG 0
#if DEBUG
#include <stdio.h>
--- a/sys/src/ape/X11/lib/Xfont/Speedo/do_trns.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/do_trns.c
@@ -36,8 +36,6 @@
#endif
#include "spdo_prv.h" /* General definitions for Speedo */
-#define DEBUG 0
-
#if DEBUG
#include <stdio.h>
#define SHOW(X) printf("X = %d\n", X)--- a/sys/src/ape/X11/lib/Xfont/Speedo/out_bl2d.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/out_bl2d.c
@@ -35,7 +35,6 @@
#include "spdo_prv.h" /* General definitions for speedo */
#define CLOCKWISE 1
-#define DEBUG 0
#define ABS(X) ( (X < 0) ? -X : X)
#if DEBUG
--- a/sys/src/ape/X11/lib/Xfont/Speedo/out_blk.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/out_blk.c
@@ -36,7 +36,6 @@
#endif
#include "spdo_prv.h" /* General definitions for Speedo */
-#define DEBUG 0
#define LOCAL static
#define ABS(X) ( (X < 0) ? -X : X)
--- a/sys/src/ape/X11/lib/Xfont/Speedo/out_outl.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/out_outl.c
@@ -36,8 +36,6 @@
#include "spdo_prv.h" /* General definitions for Speedo */
-#define DEBUG 0
-
#if DEBUG
#include <stdio.h>
#define SHOW(X) printf("X = %d\n", X)--- a/sys/src/ape/X11/lib/Xfont/Speedo/out_scrn.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/out_scrn.c
@@ -36,7 +36,6 @@
#endif
#include "spdo_prv.h" /* General definitions for Speedo */
-#define DEBUG 0
#define LOCAL static
#define ABS(X) ( (X < 0) ? -X : X)
--- a/sys/src/ape/X11/lib/Xfont/Speedo/out_util.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/out_util.c
@@ -27,7 +27,6 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#define DEBUG 0
/*************************** O U T _ U T I L . C *****************************
* *
--- a/sys/src/ape/X11/lib/Xfont/Speedo/reset.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/reset.c
@@ -37,7 +37,6 @@
#include "spdo_prv.h" /* General definitions for Speedo */
#include "keys.h" /* Font decryption keys */
-#define DEBUG 0
#if DEBUG
#include <stdio.h>
--- a/sys/src/ape/X11/lib/Xfont/Speedo/set_spcs.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/set_spcs.c
@@ -36,8 +36,6 @@
#include "spdo_prv.h" /* General definitions for Speedo */
#include "keys.h"
-#define DEBUG 0
-
#if DEBUG
#include <stdio.h>
#define SHOW(X) printf("X = %d\n", X)--- a/sys/src/ape/X11/lib/Xfont/Speedo/set_trns.c
+++ b/sys/src/ape/X11/lib/Xfont/Speedo/set_trns.c
@@ -39,8 +39,6 @@
#endif
#include "spdo_prv.h" /* General definitions for Speedo */
-#define DEBUG 0
-
#if DEBUG
#include <stdio.h>
#define SHOW(X) printf("X = %d\n", X)--- a/sys/src/ape/X11/lib/Xfont/bitmap/pcfread.c
+++ b/sys/src/ape/X11/lib/Xfont/bitmap/pcfread.c
@@ -45,9 +45,7 @@
#endif
#include <stdarg.h>
-#ifndef PLAN9
#include <stdint.h>
-#endif
void
pcfError(const char* message, ...)
--- a/sys/src/ape/X11/lib/Xmu/CmapAlloc.c
+++ b/sys/src/ape/X11/lib/Xmu/CmapAlloc.c
@@ -301,7 +301,7 @@
return icbrt_with_guess(a, a>>2*bits/3);
}
-#ifdef _X_ROOT_STATS
+#if defined(_X_ROOT_STATS) || defined(DEBUG)
int icbrt_loopcount;
#endif
--- a/sys/src/ape/X11/lib/lbxutil/lbx_zlib/lbx_zlib.h
+++ b/sys/src/ape/X11/lib/lbxutil/lbx_zlib/lbx_zlib.h
@@ -114,10 +114,6 @@
#define EWOULDBLOCK WSAEWOULDBLOCK
#endif
-#ifdef PLAN9
-#define EWOULDBLOCK EAGAIN
-#endif
-
/* lbx_zlib_io.c */
extern int GetInputPtr ( int fd, ZlibBufferPtr inbuf, int reqlen,
unsigned char **ppkt );
--- a/sys/src/ape/X11/lib/pixman/pixman-private.h
+++ b/sys/src/ape/X11/lib/pixman/pixman-private.h
@@ -27,8 +27,6 @@
# define BITMAP_BIT_ORDER LSBFirst
#endif
-#define DEBUG 0
-
#if defined (__GNUC__)
# define FUNC ((const char*) (__PRETTY_FUNCTION__))
#elif defined (__sun) || (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)