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 /xkb/ddxList.c | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
| download | xserver-adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39.tar.gz | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'xkb/ddxList.c')
| -rw-r--r-- | xkb/ddxList.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 8337022a3..5101de53b 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.7 2001/10/28 03:34:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ #include <stdio.h> #include <ctype.h> @@ -57,21 +57,12 @@ static char *componentDirs[_XkbListNumComponents] = { /***====================================================================***/ -Status -#if NeedFunctionPrototypes +static Status _AddListComponent( XkbSrvListInfoPtr list, int what, unsigned flags, char * str, ClientPtr client) -#else -_AddListComponent(list,what,flags,str,client) - XkbSrvListInfoPtr list; - int what; - unsigned flags; - char * str; - ClientPtr client; -#endif { int slen,wlen; unsigned char * wire8; @@ -119,18 +110,10 @@ char * tmp; /***====================================================================***/ static Status -#if NeedFunctionPrototypes XkbDDXListComponent( DeviceIntPtr dev, int what, XkbSrvListInfoPtr list, ClientPtr client) -#else -XkbDDXListComponent(dev,what,list,client) - DeviceIntPtr dev; - int what; - XkbSrvListInfoPtr list; - ClientPtr client; -#endif { char *file,*map,*tmp,buf[PATH_MAX]; FILE *in; @@ -284,14 +267,7 @@ char tmpname[32]; /* ARGSUSED */ Status -#if NeedFunctionPrototypes XkbDDXList(DeviceIntPtr dev,XkbSrvListInfoPtr list,ClientPtr client) -#else -XkbDDXList(dev,list,client) - DeviceIntPtr dev; - XkbSrvListInfoPtr list; - ClientPtr client; -#endif { Status status; |