diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
| commit | 2eadcf4eb451a125e9fc7c5fc9b4d09024019316 (patch) | |
| tree | bdbda91d988ad3e7d19d4184c2d2930be9d3d26f /src/xkbdraw.c | |
| parent | 452889aad6eca008ccba92e98eb8139dccea94d8 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
Diffstat (limited to 'src/xkbdraw.c')
| -rw-r--r-- | src/xkbdraw.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/xkbdraw.c b/src/xkbdraw.c index bbd2519..9218bc5 100644 --- a/src/xkbdraw.c +++ b/src/xkbdraw.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.3 2001/07/29 05:01:13 tsi Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.4 2003/11/17 22:20:23 dawes Exp $ */ #include <stdio.h> #include <ctype.h> @@ -40,14 +40,7 @@ #include "XKBfileInt.h" static void -#if NeedFunctionPrototypes _XkbAddDrawable(XkbDrawablePtr *pfirst,XkbDrawablePtr *plast,XkbDrawablePtr tmp) -#else -_XkbAddDrawable(pfirst,plast,tmp) - XkbDrawablePtr * pfirst; - XkbDrawablePtr * plast; - XkbDrawablePtr tmp; -#endif { XkbDrawablePtr old; @@ -74,13 +67,7 @@ XkbDrawablePtr old; } XkbDrawablePtr -#if NeedFunctionPrototypes XkbGetOrderedDrawables(XkbGeometryPtr geom,XkbSectionPtr section) -#else -XkbGetOrderedDrawables(geom,section) - XkbGeometryPtr geom; - XkbSectionPtr section; -#endif { XkbDrawablePtr first,last,tmp; int i; @@ -133,12 +120,7 @@ int i; } void -#if NeedFunctionPrototypes XkbFreeOrderedDrawables(XkbDrawablePtr draw) -#else -XkbFreeOrderedDrawables(draw) - XkbDrawablePtr draw; -#endif { XkbDrawablePtr tmp; |