diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /dbe | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
Diffstat (limited to 'dbe')
| -rw-r--r-- | dbe/dbestruct.h | 25 | ||||
| -rw-r--r-- | dbe/midbe.h | 3 |
2 files changed, 2 insertions, 26 deletions
diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index c429cede8..3634fe7d7 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -30,6 +30,7 @@ * Header file for DIX-related DBE * *****************************************************************************/ +/* $XFree86: xc/programs/Xserver/dbe/dbestruct.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ #ifndef DBE_STRUCT_H @@ -179,77 +180,53 @@ typedef struct _DbeScreenPrivRec /* Per-screen DIX routines */ Bool (*SetupBackgroundPainter)( -#if NeedNestedPrototypes WindowPtr /*pWin*/, GCPtr /*pGC*/ -#endif ); DbeWindowPrivPtr (*AllocWinPriv)( -#if NeedNestedPrototypes ScreenPtr /*pScreen*/ -#endif ); int (*AllocWinPrivPrivIndex)( -#if NeedNestedPrototypes void -#endif ); Bool (*AllocWinPrivPriv)( -#if NeedNestedPrototypes ScreenPtr /*pScreen*/, int /*index*/, unsigned /*amount*/ -#endif ); /* Per-screen DDX routines */ Bool (*GetVisualInfo)( -#if NeedNestedPrototypes ScreenPtr /*pScreen*/, XdbeScreenVisualInfo * /*pVisInfo*/ -#endif ); int (*AllocBackBufferName)( -#if NeedNestedPrototypes WindowPtr /*pWin*/, XID /*bufId*/, int /*swapAction*/ -#endif ); int (*SwapBuffers)( -#if NeedNestedPrototypes ClientPtr /*client*/, int * /*pNumWindows*/, DbeSwapInfoPtr /*swapInfo*/ -#endif ); void (*BeginIdiom)( -#if NeedNestedPrototypes ClientPtr /*client*/ -#endif ); void (*EndIdiom)( -#if NeedNestedPrototypes ClientPtr /*client*/ -#endif ); void (*WinPrivDelete)( -#if NeedNestedPrototypes DbeWindowPrivPtr /*pDbeWindowPriv*/, XID /*bufId*/ -#endif ); void (*ResetProc)( -#if NeedNestedPrototypes ScreenPtr /*pScreen*/ -#endif ); void (*ValidateBuffer)( -#if NeedNestedPrototypes WindowPtr /*pWin*/, XID /*bufId*/, Bool /*dstbuffer*/ -#endif ); /* Device-specific private information. diff --git a/dbe/midbe.h b/dbe/midbe.h index 7b91a6697..7b1237633 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -30,6 +30,7 @@ * Header file for users of machine-independent DBE code * *****************************************************************************/ +/* $XFree86: xc/programs/Xserver/dbe/midbe.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ #ifndef MIDBE_H @@ -38,10 +39,8 @@ /* EXTERNS */ extern Bool miDbeInit( -#if NeedFunctionPrototypes ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv -#endif ); #endif /* MIDBE_H */ |