diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-21 16:07:38 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-21 16:07:38 -0700 |
| commit | 7ac6a6b7d0dfc5e021270b2898accd3425aa008a (patch) | |
| tree | 5afdeb8b639763c349f1c9194091e0939e87b4ac /include | |
| parent | 0782894b5702adcf6f4a90861793b717f3856fa5 (diff) | |
| parent | f7ef6fd9a1a1f48603df2796fe7c904c25a81077 (diff) | |
Merge remote branch 'vignatti/for-keith'
Conflicts:
exa/exa.c
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config.h.in | 6 | ||||
| -rw-r--r-- | include/globals.h | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 058c8fd14..7759aac6a 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -360,9 +360,6 @@ /* Support Xv extension */ #undef XV -/* Build Multibuffer extension */ -#undef MULTIBUFFER - /* Support DRI extension */ #undef XF86DRI @@ -411,9 +408,6 @@ /* Support HAL for hotplug */ #undef CONFIG_HAL -/* Use only built-in fonts */ -#undef BUILTIN_FONTS - /* Have a monotonic clock from clock_gettime() */ #undef MONOTONIC_CLOCK diff --git a/include/globals.h b/include/globals.h index c8d79c133..6959fc71a 100644 --- a/include/globals.h +++ b/include/globals.h @@ -69,10 +69,6 @@ extern _X_EXPORT Bool noScreenSaverExtension; extern _X_EXPORT Bool noMITShmExtension; #endif -#ifdef MULTIBUFFER -extern _X_EXPORT Bool noMultibufferExtension; -#endif - #ifdef RANDR extern _X_EXPORT Bool noRRExtension; #endif |