diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-07 03:12:40 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-07 03:12:40 +0000 |
| commit | 7da3f4a786d9b61f4129c7dbbef80c84abbfde68 (patch) | |
| tree | dda62bda1e24e615d5bb2283e42cb13c8f74f92d /hw/xfree86/utils/xorgcfg | |
| parent | f86562540d1c945bfd96d4b89259d81e4ed25255 (diff) | |
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Fix warnings
about redefined macros (Peter Breitenlohner)
Diffstat (limited to 'hw/xfree86/utils/xorgcfg')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/loader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index 5066b753d..8e4da34c3 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -36,7 +36,9 @@ #else +#ifndef XFree86LOADER #define XFree86LOADER /* not really */ +#endif #define IN_LOADER #include "xf86.h" @@ -44,7 +46,9 @@ #include "xf86Opt.h" #include "xf86Module.h" +#ifndef XINPUT #define XINPUT +#endif #include "xf86Xinput.h" #include <X11/fonts/fontmod.h> |