diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2005-02-01 11:06:51 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2005-02-01 11:06:51 +0000 |
| commit | e5c384659ffe5576aa0c68be446f96cb6b309943 (patch) | |
| tree | 4f705cd001aa1231b47a0671fc76ab013847fbba | |
| parent | 0ce122e41eef7de7f5538e66b7e1567d2e7ea22f (diff) | |
xc/programs/xrx/plugin/include/npapi.hXORG-6_8_2XORG-6_8_1_904XORG-6_8-branch
//bugs.freedesktop.org/show_bug.cgi?id=2386) attachment #1766
(https://bugs.freedesktop.org/attachment.cgi?id=1766): Fix build
bustage on MacOSX/*BSD and AIX platforms (1:1 port of the build bustage
fixes from trunk). Patch by Dan McNichol <mcnichol@austin.ibm.com> and
Torrey T. Lyons <torrey@mrcla.com>. Approved in the 2005-01-31 Xorg
release-wranglers phone call.
| -rw-r--r-- | plugin/include/npapi.h | 3 | ||||
| -rw-r--r-- | xnest-plugin/XnestDis.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/plugin/include/npapi.h b/plugin/include/npapi.h index a45b264..00be015 100644 --- a/plugin/include/npapi.h +++ b/plugin/include/npapi.h @@ -40,12 +40,15 @@ typedef unsigned short uint16; #ifndef _UINT32 typedef unsigned int uint32; #endif + +#if !(defined(_AIX) && defined(_H_INTTYPES) && defined(_ALL_SOURCE)) #ifndef _INT16 typedef short int16; #endif #ifndef _INT32 typedef int int32; #endif +#endif #ifndef FALSE #define FALSE (0) diff --git a/xnest-plugin/XnestDis.c b/xnest-plugin/XnestDis.c index a53203b..a30c79e 100644 --- a/xnest-plugin/XnestDis.c +++ b/xnest-plugin/XnestDis.c @@ -29,6 +29,7 @@ The Open Group. /* $XFree86$ */ #include "RxPlugin.h" +#include <sys/stat.h> /*********************************************************************** * Utility functions and global variable to manage display numbers |