diff options
Diffstat (limited to 'xorg-server/include')
-rw-r--r-- | xorg-server/include/.gitignore | 10 | ||||
-rw-r--r-- | xorg-server/include/dix-config-apple-verbatim.h | 16 | ||||
-rw-r--r-- | xorg-server/include/kdrive-config.h.in | 80 | ||||
-rw-r--r-- | xorg-server/include/version-config.h.in | 32 | ||||
-rw-r--r-- | xorg-server/include/xsha1.h | 38 |
5 files changed, 88 insertions, 88 deletions
diff --git a/xorg-server/include/.gitignore b/xorg-server/include/.gitignore index 8fffad782..dc9067ab3 100644 --- a/xorg-server/include/.gitignore +++ b/xorg-server/include/.gitignore @@ -1,5 +1,5 @@ -# Add & Override for this directory and it's subdirectories
-*-config.h
-do-not-use-config.h.in
-xorg-server.h
-
+# Add & Override for this directory and it's subdirectories +*-config.h +do-not-use-config.h.in +xorg-server.h + diff --git a/xorg-server/include/dix-config-apple-verbatim.h b/xorg-server/include/dix-config-apple-verbatim.h index 720897c80..f429d200e 100644 --- a/xorg-server/include/dix-config-apple-verbatim.h +++ b/xorg-server/include/dix-config-apple-verbatim.h @@ -1,8 +1,8 @@ -/* Do not include this file directly. It is included at the end of <dix-config.h> */
-
-/* Correctly set _XSERVER64 for OSX fat binaries */
-#if defined(__LP64__) && !defined(_XSERVER64)
-#define _XSERVER64 1
-#elif !defined(__LP64__) && defined(_XSERVER64)
-#undef _XSERVER64
-#endif
+/* Do not include this file directly. It is included at the end of <dix-config.h> */ + +/* Correctly set _XSERVER64 for OSX fat binaries */ +#if defined(__LP64__) && !defined(_XSERVER64) +#define _XSERVER64 1 +#elif !defined(__LP64__) && defined(_XSERVER64) +#undef _XSERVER64 +#endif diff --git a/xorg-server/include/kdrive-config.h.in b/xorg-server/include/kdrive-config.h.in index 887213d78..0e54aa18f 100644 --- a/xorg-server/include/kdrive-config.h.in +++ b/xorg-server/include/kdrive-config.h.in @@ -1,40 +1,40 @@ -/* kdrive-config.h.in: not at all generated. -*- c -*-
- */
-
-#ifndef _KDRIVE_CONFIG_H_
-#define _KDRIVE_CONFIG_H_
-
-#include <dix-config.h>
-#include <xkb-config.h>
-
-/* Building kdrive server. */
-#undef KDRIVESERVER
-
-/* Include framebuffer support in X servers */
-#undef KDRIVEFBDEV
-
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
-/* Support tslib touchscreen abstraction library */
-#undef TSLIB
-
-/* Support KDrive kbd driver */
-#undef KDRIVE_KBD
-
-/* Support KDrive mouse driver */
-#undef KDRIVE_MOUSE
-
-/* Support KDrive evdev driver */
-#undef KDRIVE_EVDEV
-
-/* Verbose debugging output hilarity */
-#undef DEBUG
-
-/* Have the backtrace() function. */
-#undef HAVE_BACKTRACE
-
-/* Have execinfo.h for backtrace(). */
-#undef HAVE_EXECINFO_H
-
-#endif /* _KDRIVE_CONFIG_H_ */
+/* kdrive-config.h.in: not at all generated. -*- c -*- + */ + +#ifndef _KDRIVE_CONFIG_H_ +#define _KDRIVE_CONFIG_H_ + +#include <dix-config.h> +#include <xkb-config.h> + +/* Building kdrive server. */ +#undef KDRIVESERVER + +/* Include framebuffer support in X servers */ +#undef KDRIVEFBDEV + +/* Enable touchscreen support */ +#undef TOUCHSCREEN + +/* Support tslib touchscreen abstraction library */ +#undef TSLIB + +/* Support KDrive kbd driver */ +#undef KDRIVE_KBD + +/* Support KDrive mouse driver */ +#undef KDRIVE_MOUSE + +/* Support KDrive evdev driver */ +#undef KDRIVE_EVDEV + +/* Verbose debugging output hilarity */ +#undef DEBUG + +/* Have the backtrace() function. */ +#undef HAVE_BACKTRACE + +/* Have execinfo.h for backtrace(). */ +#undef HAVE_EXECINFO_H + +#endif /* _KDRIVE_CONFIG_H_ */ diff --git a/xorg-server/include/version-config.h.in b/xorg-server/include/version-config.h.in index 4fb614dae..8180dff8e 100644 --- a/xorg-server/include/version-config.h.in +++ b/xorg-server/include/version-config.h.in @@ -1,16 +1,16 @@ -/* version-config.h.in: not generated */
-
-#ifndef VERSION_CONFIG_H
-#define VERSION_CONFIG_H
-
-/* Vendor man version */
-#undef VENDOR_MAN_VERSION
-
-/* Vendor name */
-#undef VENDOR_NAME
-
-/* Vendor release */
-#undef VENDOR_RELEASE
-
-#endif /* VERSION_CONFIG_H */
-
+/* version-config.h.in: not generated */ + +#ifndef VERSION_CONFIG_H +#define VERSION_CONFIG_H + +/* Vendor man version */ +#undef VENDOR_MAN_VERSION + +/* Vendor name */ +#undef VENDOR_NAME + +/* Vendor release */ +#undef VENDOR_RELEASE + +#endif /* VERSION_CONFIG_H */ + diff --git a/xorg-server/include/xsha1.h b/xorg-server/include/xsha1.h index 89e6f5f0b..aab71067a 100644 --- a/xorg-server/include/xsha1.h +++ b/xorg-server/include/xsha1.h @@ -1,19 +1,19 @@ -#ifndef XSHA1_H
-#define XSHA1_H
-
-/* Initialize SHA1 computation. Returns NULL on error. */
-void *x_sha1_init(void);
-
-/*
- * Add some data to be hashed. ctx is the value returned by x_sha1_init()
- * Returns 0 on error, 1 on success.
- */
-int x_sha1_update(void *ctx, void *data, int size);
-
-/*
- * Place the hash in result, and free ctx.
- * Returns 0 on error, 1 on success.
- */
-int x_sha1_final(void *ctx, unsigned char result[20]);
-
-#endif
+#ifndef XSHA1_H +#define XSHA1_H + +/* Initialize SHA1 computation. Returns NULL on error. */ +void *x_sha1_init(void); + +/* + * Add some data to be hashed. ctx is the value returned by x_sha1_init() + * Returns 0 on error, 1 on success. + */ +int x_sha1_update(void *ctx, void *data, int size); + +/* + * Place the hash in result, and free ctx. + * Returns 0 on error, 1 on success. + */ +int x_sha1_final(void *ctx, unsigned char result[20]); + +#endif |