diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-28 17:20:58 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-28 17:20:58 +1000 |
commit | d7aef3f663f4b5d861799f8615dcd301d5ce2906 (patch) | |
tree | 3a5ed1b3dc7e83536979578e3da99f2860f44b11 /include/xorg-config.h.in | |
parent | a25f248fc3bd0375d91ca8a44320200d445ecfbb (diff) | |
parent | e08c6a0752772745f35f7afcf6c2b1c927b91cc0 (diff) |
Merge branch 'master' into xi2
Conflicts:
Xext/geext.c
Xi/chdevcur.c
Xi/extgrbdev.c
Xi/xiproperty.c
configure.ac
dix/ptrveloc.c
hw/xfree86/common/xf86Config.c
mi/mipointer.h
test/input.c
xkb/xkb.c
Diffstat (limited to 'include/xorg-config.h.in')
-rw-r--r-- | include/xorg-config.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index f9b77d03d..ebeb44a37 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -54,6 +54,9 @@ /* Solaris 8 or later? */ #undef __SOL8__ +/* Define to 1 if you have the <stropts.h> header file. */ +#undef HAVE_STROPTS_H + /* Define to 1 if you have the <sys/kd.h> header file. */ #undef HAVE_SYS_KD_H |