diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-12-26 18:18:04 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-12-26 18:18:04 +0000 |
| commit | bf98a33803e6c74f6b0015add1271e7f843e5ac6 (patch) | |
| tree | 129826e3725b385528392686164396047248b399 | |
| parent | 25ac65dfd98ff8dcb948b07d8ca4e8124e40bf60 (diff) | |
Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/apm_driver.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2005-12-26 Adam Jackson <ajax@freedesktop.org> + + * src/apm_driver.c: + Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck) + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/src/apm_driver.c b/src/apm_driver.c index 08b7aab..0c920a0 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -16,7 +16,7 @@ #define DPMS_SERVER #include <X11/extensions/dpms.h> -#define VERSION 4000 +#define APM_VERSION 4000 #define APM_NAME "APM" #define APM_DRIVER_NAME "apm" #define APM_MAJOR_VERSION 1 @@ -59,7 +59,7 @@ int ApmPixmapIndex = -1; static unsigned long ApmGeneration = 0; _X_EXPORT DriverRec APM = { - VERSION, + APM_VERSION, APM_DRIVER_NAME, ApmIdentify, ApmProbe, |