So just make it a local constant. While I was at it, I declared it as an appropriately-typed static constant rather than a preprocessor substitution.
Signed-off-by: Jamey Sharp <[email protected]> Cc: Jeremy Huddleston <[email protected]> Cc: Jon TURNEY <[email protected]> Cc: Colin Harrison <[email protected]> --- miext/rootless/README.txt | 4 ---- miext/rootless/rootlessConfig.h | 2 -- miext/rootless/rootlessScreen.c | 4 +--- 3 files changed, 1 insertions(+), 9 deletions(-) diff --git a/miext/rootless/README.txt b/miext/rootless/README.txt index 3ae5ce5..405f3bc 100644 --- a/miext/rootless/README.txt +++ b/miext/rootless/README.txt @@ -76,10 +76,6 @@ rootlessConfig.h to specify compile time options for its platform. The following compile-time options are defined in rootlessConfig.h: - o ROOTLESS_REDISPLAY_DELAY: Time in milliseconds between updates to - the underlying window server. Most operations will be buffered until - this time has expired. - o ROOTLESS_RESIZE_GRAVITY: If the underlying window system supports it, some frame resizes can be optimized by relying on the frame contents maintaining a particular gravity during the resize. In this way less diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index 8fb502d..a25c503 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -36,7 +36,6 @@ #ifdef __APPLE__ -# define ROOTLESS_REDISPLAY_DELAY 10 # define ROOTLESS_RESIZE_GRAVITY TRUE /*# define ROOTLESSDEBUG*/ @@ -44,7 +43,6 @@ #if defined(__CYGWIN__) || defined(WIN32) -# define ROOTLESS_REDISPLAY_DELAY 10 # undef ROOTLESS_RESIZE_GRAVITY /*# define ROOTLESSDEBUG*/ diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 43b9cbb..3425a7b 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -53,9 +53,7 @@ #include "rootlessWindow.h" /* In milliseconds */ -#ifndef ROOTLESS_REDISPLAY_DELAY -#define ROOTLESS_REDISPLAY_DELAY 10 -#endif +static const CARD32 ROOTLESS_REDISPLAY_DELAY = 10; extern int RootlessMiValidateTree(WindowPtr pRoot, WindowPtr pChild, VTKind kind); -- 1.7.0 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
