From 990bc3f015a4f8fce2eb918375defcd44980a845 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Jun 2012 09:33:13 +0200 Subject: Used synchronise script to update files --- xorg-server/include/.gitignore | 5 ++ xorg-server/include/dix-config-apple-verbatim.h | 16 ++--- xorg-server/include/kdrive-config.h.in | 80 ++++++++++++------------- xorg-server/include/pixmap.h | 4 +- xorg-server/include/screenint.h | 1 - xorg-server/include/scrnintstr.h | 12 +--- xorg-server/include/version-config.h.in | 32 +++++----- xorg-server/include/xsha1.h | 38 ++++++------ 8 files changed, 93 insertions(+), 95 deletions(-) create mode 100644 xorg-server/include/.gitignore (limited to 'xorg-server/include') diff --git a/xorg-server/include/.gitignore b/xorg-server/include/.gitignore new file mode 100644 index 000000000..8fffad782 --- /dev/null +++ b/xorg-server/include/.gitignore @@ -0,0 +1,5 @@ +# 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 f429d200e..720897c80 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 */ - -/* 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 */ + +/* 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 0e54aa18f..887213d78 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 -#include - -/* 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 +#include + +/* 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/pixmap.h b/xorg-server/include/pixmap.h index 26d737c4d..9bb5bb7b8 100644 --- a/xorg-server/include/pixmap.h +++ b/xorg-server/include/pixmap.h @@ -100,9 +100,9 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ , extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ ); -extern _X_EXPORT Bool CreateScratchPixmapsForScreen(int /*scrnum */ ); +extern _X_EXPORT Bool CreateScratchPixmapsForScreen(ScreenPtr /*pScreen */ ); -extern _X_EXPORT void FreeScratchPixmapsForScreen(int /*scrnum */ ); +extern _X_EXPORT void FreeScratchPixmapsForScreen(ScreenPtr /*pScreen */ ); extern _X_EXPORT PixmapPtr AllocatePixmap(ScreenPtr /*pScreen */ , int /*pixDataSize */ ); diff --git a/xorg-server/include/screenint.h b/xorg-server/include/screenint.h index 881747182..6b0cc70ee 100644 --- a/xorg-server/include/screenint.h +++ b/xorg-server/include/screenint.h @@ -55,7 +55,6 @@ typedef struct _Depth *DepthPtr; typedef struct _Screen *ScreenPtr; extern _X_EXPORT int AddScreen(Bool (* /*pfnInit */ )( - int /*index */ , ScreenPtr /*pScreen */ , int /*argc */ , diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index 0ae937777..c592d1ffe 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -95,8 +95,7 @@ typedef struct _ScreenSaverStuff { * or as a local variable) can easily do so and retain full type checking. */ -typedef Bool (*CloseScreenProcPtr) (int /*index */ , - ScreenPtr /*pScreen */ ); +typedef Bool (*CloseScreenProcPtr) (ScreenPtr /*pScreen */ ); typedef void (*QueryBestSizeProcPtr) (int /*class */ , unsigned short * /*pwidth */ , @@ -258,13 +257,11 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ , int /*major */ , int /*minor */ ); -typedef void (*ScreenBlockHandlerProcPtr) (int /*screenNum */ , - pointer /*blockData */ , +typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ , pointer /*pTimeout */ , pointer /*pReadmask */ ); -typedef void (*ScreenWakeupHandlerProcPtr) (int /*screenNum */ , - pointer /*wakeupData */ , +typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ , unsigned long /*result */ , pointer /*pReadMask */ ); @@ -440,9 +437,6 @@ typedef struct _Screen { ScreenBlockHandlerProcPtr BlockHandler; ScreenWakeupHandlerProcPtr WakeupHandler; - pointer blockData; - pointer wakeupData; - /* anybody can get a piece of this array */ PrivateRec *devPrivates; diff --git a/xorg-server/include/version-config.h.in b/xorg-server/include/version-config.h.in index 8180dff8e..4fb614dae 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 aab71067a..89e6f5f0b 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 -- cgit v1.2.3