Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

2006-10-26 00:28:30 +03:00
parent 3da918a16c d285833290
commit cdc8a4b7b2
6 changed files with 111 additions and 9 deletions
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -457,4 +457,7 @@
 /* Use an empty root cursor */
 #undef NULL_ROOT_CURSOR

+/* Have a monotonic clock from clock_gettime() */
+#undef MONOTONIC_CLOCK
+
 #endif /* _DIX_CONFIG_H_ */