diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-08 10:38:59 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-08 10:38:59 +0100 |
| commit | 110b0c9eb192808d1f7d39b71258be047b2bcc7d (patch) | |
| tree | 31853e6e1e335d21148e8941b60b8e22ad76ffbe /xorg-server | |
| parent | acd000667561cb9978ead7f14d4fbb97c1a8e727 (diff) | |
| download | vcxsrv-110b0c9eb192808d1f7d39b71258be047b2bcc7d.tar.gz vcxsrv-110b0c9eb192808d1f7d39b71258be047b2bcc7d.tar.bz2 vcxsrv-110b0c9eb192808d1f7d39b71258be047b2bcc7d.zip | |
Synchronised dix-config.h and dix-config.h.in
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/Xext/syncsrv.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/xwin-config.h | 10 | ||||
| -rw-r--r-- | xorg-server/os/oscolor.c | 4 |
3 files changed, 4 insertions, 12 deletions
diff --git a/xorg-server/Xext/syncsrv.h b/xorg-server/Xext/syncsrv.h index 2b7077364..46f25bdfc 100644 --- a/xorg-server/Xext/syncsrv.h +++ b/xorg-server/Xext/syncsrv.h @@ -118,7 +118,7 @@ typedef union { } SyncAwaitUnion; extern pointer SyncCreateSystemCounter( - const char */* name */, + const char * /* name */, CARD64 /* inital_value */, CARD64 /* resolution */, SyncCounterType /* change characterization */, diff --git a/xorg-server/include/xwin-config.h b/xorg-server/include/xwin-config.h index 645a6cead..a509162ee 100644 --- a/xorg-server/include/xwin-config.h +++ b/xorg-server/include/xwin-config.h @@ -10,7 +10,7 @@ #define HAS_WINSOCK /* Cygwin has /dev/windows for signaling new win32 messages */ -// let's should this for now #define HAS_DEVWINDOWS 1 +/* #undef HAS_DEVWINDOWS */ /* Switch on debug messages */ /* #undef CYGDEBUG */ @@ -20,18 +20,14 @@ /* Define to 1 if unsigned long is 64 bits. */ /* #undef _XSERVER64 */ -/* Do we require our own snprintf? */ -/* #undef NEED_SNPRINTF */ - /* Short vendor name */ #define XVENDORNAMESHORT "VcXsrv" /* Vendor web address for support */ #define __VENDORDWEBSUPPORT__ "http://www.hc-consult.be/" -/* Default log location */ -#define DEFAULT_LOGDIR "." - /* Location of system.XWinrc */ #define SYSCONFDIR "." +/* Default log location */ +#define DEFAULT_LOGDIR "." diff --git a/xorg-server/os/oscolor.c b/xorg-server/os/oscolor.c index 4e1513f53..7f6b93880 100644 --- a/xorg-server/os/oscolor.c +++ b/xorg-server/os/oscolor.c @@ -49,10 +49,6 @@ SOFTWARE. #include <dix-config.h> #endif -#ifdef _MSC_VER -#define strncasecmp _strnicmp -#endif - #include <X11/keysym.h> #include "os.h" |