diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-17 14:36:34 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-17 14:36:34 -0700 |
| commit | 64d2d1bef14c7ec7156bb3aae64eff69f9f7be54 (patch) | |
| tree | 97e08a3a7b06c8c491be1bda793386c293d21ded /include | |
| parent | fb84be47db7cdaff406792c08e34670e8e0cbda9 (diff) | |
| parent | 679c84bce9b03c17aa35fa69058e7e46267dbc7b (diff) | |
Merge remote-tracking branch 'jeremyhu/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/inpututils.h | 6 | ||||
| -rw-r--r-- | include/os.h | 1 | ||||
| -rw-r--r-- | include/xorg-config.h.in | 15 |
3 files changed, 9 insertions, 13 deletions
diff --git a/include/inpututils.h b/include/inpututils.h index 47e242d87..2832ed5b1 100644 --- a/include/inpututils.h +++ b/include/inpututils.h @@ -30,6 +30,7 @@ #define INPUTUTILS_H #include "input.h" +#include <X11/extensions/XI2proto.h> struct _ValuatorMask { int8_t last_bit; /* highest bit set in mask */ @@ -40,4 +41,9 @@ struct _ValuatorMask { extern void verify_internal_event(const InternalEvent *ev); extern void init_device_event(DeviceEvent *event, DeviceIntPtr dev, Time ms); +FP3232 double_to_fp3232(double in); +FP1616 double_to_fp1616(double in); +double fp1616_to_double(FP1616 in); +double fp3232_to_double(FP3232 in); + #endif diff --git a/include/os.h b/include/os.h index 5401ea478..b489211ab 100644 --- a/include/os.h +++ b/include/os.h @@ -551,7 +551,6 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X extern _X_EXPORT void VErrorF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0); extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); -extern _X_EXPORT void Error(const char *str); extern _X_EXPORT void LogPrintMarkers(void); extern _X_EXPORT void xorg_backtrace(void); diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index 0d1ea9142..6b9230f3c 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -118,18 +118,6 @@ /* Have execinfo.h */ #undef HAVE_EXECINFO_H -/* Have pci_system_init_dev_mem() */ -#undef HAVE_PCI_SYSTEM_INIT_DEV_MEM - -/* Define to 1 if you have the `pci_device_is_boot_vga' function. */ -#undef HAVE_PCI_DEVICE_IS_BOOT_VGA - -/* Have pci_enable_device */ -#undef HAVE_PCI_DEVICE_ENABLE - -/* Define to 1 if you have the `pci_device_vgaarb_init' function. */ -#undef HAVE_PCI_DEVICE_VGAARB_INIT - /* Path to text files containing PCI IDs */ #undef PCI_TXT_IDS_PATH @@ -139,4 +127,7 @@ /* Build with libdrm support */ #undef WITH_LIBDRM +/* Use libpciaccess */ +#undef XSERVER_LIBPCIACCESS + #endif /* _XORG_CONFIG_H_ */ |