summaryrefslogtreecommitdiff
path: root/src/xkbbells.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:40 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:40 +0000
commit2eadcf4eb451a125e9fc7c5fc9b4d09024019316 (patch)
treebdbda91d988ad3e7d19d4184c2d2930be9d3d26f /src/xkbbells.c
parent452889aad6eca008ccba92e98eb8139dccea94d8 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
Diffstat (limited to 'src/xkbbells.c')
-rw-r--r--src/xkbbells.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/xkbbells.c b/src/xkbbells.c
index 8214eed..f425b93 100644
--- a/src/xkbbells.c
+++ b/src/xkbbells.c
@@ -24,6 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/lib/xkbfile/xkbbells.c,v 1.2 2003/11/17 22:20:23 dawes Exp $ */
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
@@ -80,15 +81,7 @@ static char *_xkbStdBellNames[XkbBI_NumBells] = {
static Atom _xkbStdBellAtoms[XkbBI_NumBells];
Bool
-#if NeedFunctionPrototypes
XkbStdBell(Display *dpy,Window win,int percent,int bellDef)
-#else
-XkbStdBell(dpy,win,percent,bellDef)
- Display * dpy;
- Window win;
- int percent;
- int bellDef;
-#endif
{
if ((bellDef<0)||(bellDef>=XkbBI_NumBells))
bellDef= XkbBI_Info;
@@ -98,15 +91,7 @@ XkbStdBell(dpy,win,percent,bellDef)
}
Bool
-#if NeedFunctionPrototypes
XkbStdBellEvent(Display *dpy,Window win,int percent,int bellDef)
-#else
-XkbStdBellEvent(dpy,win,percent,bellDef)
- Display * dpy;
- Window win;
- int percent;
- int bellDef;
-#endif
{
if ((bellDef<0)||(bellDef>=XkbBI_NumBells))
bellDef= XkbBI_Info;