include: add/fix include guards where missing/broken
Signed-off-by: Mike Gelfand <mikedld@mikedld.com>
This commit is contained in:
parent
c06a2a3ed7
commit
f5e00916aa
|
@ -1,8 +1,13 @@
|
||||||
/* Do not include this file directly. It is included at the end of <dix-config.h> */
|
/* Do not include this file directly. It is included at the end of <dix-config.h> */
|
||||||
|
|
||||||
|
#ifndef XSERVER_CONFIG_APPLE_VERBATIM_H
|
||||||
|
#define XSERVER_CONFIG_APPLE_VERBATIM_H
|
||||||
|
|
||||||
/* Correctly set _XSERVER64 for OSX fat binaries */
|
/* Correctly set _XSERVER64 for OSX fat binaries */
|
||||||
#if defined(__LP64__) && !defined(_XSERVER64)
|
#if defined(__LP64__) && !defined(_XSERVER64)
|
||||||
#define _XSERVER64 1
|
#define _XSERVER64 1
|
||||||
#elif !defined(__LP64__) && defined(_XSERVER64)
|
#elif !defined(__LP64__) && defined(_XSERVER64)
|
||||||
#undef _XSERVER64
|
#undef _XSERVER64
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* XSERVER_CONFIG_APPLE_VERBATIM_H */
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
* This file has all defines used in the xwin ddx
|
* This file has all defines used in the xwin ddx
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef XSERVER_XWIN_CONFIG_H
|
||||||
|
#define XSERVER_XWIN_CONFIG_H
|
||||||
|
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
|
|
||||||
/* Winsock networking */
|
/* Winsock networking */
|
||||||
|
@ -17,3 +21,5 @@
|
||||||
|
|
||||||
/* Whether we should re-locate the root to where the executable lives */
|
/* Whether we should re-locate the root to where the executable lives */
|
||||||
#mesondefine RELOCATE_PROJECTROOT
|
#mesondefine RELOCATE_PROJECTROOT
|
||||||
|
|
||||||
|
#endif /* XSERVER_XWIN_CONFIG_H */
|
||||||
|
|
Loading…
Reference in New Issue