summaryrefslogtreecommitdiff
path: root/programs/xkbutils
diff options
context:
space:
mode:
authorhohndel <hohndel>1997-12-06 09:26:11 +0000
committerhohndel <hohndel>1997-12-06 09:26:11 +0000
commit4e5ffb4167381f1d316cd49432c10e758ba74919 (patch)
tree0b6bf67e13ab33af14384066e6726fc5a0934993 /programs/xkbutils
parent12431c45eab320f3cd9fea0e0783da634160390f (diff)
patch #1233
Diffstat (limited to 'programs/xkbutils')
-rw-r--r--programs/xkbutils/utils.c14
-rw-r--r--programs/xkbutils/xkbvleds.c4
-rw-r--r--programs/xkbutils/xkbwatch.c4
3 files changed, 3 insertions, 19 deletions
diff --git a/programs/xkbutils/utils.c b/programs/xkbutils/utils.c
index eac7ff4d4..d934d96f0 100644
--- a/programs/xkbutils/utils.c
+++ b/programs/xkbutils/utils.c
@@ -1,7 +1,7 @@
/*\
* $XConsortium: utils.c /main/2 1996/12/04 10:24:08 lehors $
- * $XFree86: xc/programs/xkbutils/utils.c,v 3.0 1996/01/10 05:43:51 dawes Exp $
+ * $XFree86: xc/programs/xkbutils/utils.c,v 3.1 1996/12/23 07:14:03 dawes Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
@@ -103,11 +103,7 @@ uFree(ptr)
/*** FUNCTION ENTRY TRACKING ***/
/***====================================================================***/
-#ifndef Lynx
-static FILE *entryFile= stderr;
-#else
static FILE *entryFile= NULL;
-#endif
int uEntryLevel;
Boolean
@@ -163,11 +159,7 @@ int i;
/*** PRINT FUNCTIONS ***/
/***====================================================================***/
-#ifndef Lynx
- FILE *uDebugFile= stderr;
-#else
FILE *uDebugFile= NULL;
-#endif
int uDebugIndentLevel= 0;
int uDebugIndentSize= 4;
@@ -217,11 +209,7 @@ int i;
/***====================================================================***/
-#ifndef Lynx
-static FILE *errorFile= stderr;
-#else
static FILE *errorFile= NULL;
-#endif
Boolean
uSetErrorFile(name)
diff --git a/programs/xkbutils/xkbvleds.c b/programs/xkbutils/xkbvleds.c
index 3cb6e13bf..bc81aa5d5 100644
--- a/programs/xkbutils/xkbvleds.c
+++ b/programs/xkbutils/xkbvleds.c
@@ -1,5 +1,5 @@
/* $XConsortium: xkbvleds.c /main/5 1996/01/14 18:42:34 kaleb $ */
-/* $XFree86: xc/programs/xkbutils/xkbvleds.c,v 3.0 1996/01/10 05:43:52 dawes Exp $ */
+/* $XFree86: xc/programs/xkbutils/xkbvleds.c,v 3.1 1996/01/16 15:09:18 dawes Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -218,11 +218,9 @@ static char * fallback_resources[] = {
NULL
};
-#ifdef Lynx
uSetEntryFile(NullString);
uSetDebugFile(NullString);
uSetErrorFile(NullString);
-#endif
bzero(leds,XkbNumIndicators*sizeof(Widget));
toplevel = XtOpenApplication(&app_con, "XkbLEDPanel", NULL, 0, &argc, argv,
fallback_resources,
diff --git a/programs/xkbutils/xkbwatch.c b/programs/xkbutils/xkbwatch.c
index 292e34048..9c16f9764 100644
--- a/programs/xkbutils/xkbwatch.c
+++ b/programs/xkbutils/xkbwatch.c
@@ -1,5 +1,5 @@
/* $XConsortium: xkbwatch.c /main/5 1996/01/14 18:53:12 kaleb $ */
-/* $XFree86: xc/programs/xkbutils/xkbwatch.c,v 3.0 1996/01/10 05:43:53 dawes Exp $ */
+/* $XFree86: xc/programs/xkbutils/xkbwatch.c,v 3.1 1996/01/16 15:09:19 dawes Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -142,11 +142,9 @@ static char * fallback_resources[] = {
NULL
};
-#ifdef Lynx
uSetEntryFile(NullString);
uSetDebugFile(NullString);
uSetErrorFile(NullString);
-#endif
toplevel = XtOpenApplication(&app_con, "XkbWatch",
options, XtNumber(options), &argc, argv,
fallback_resources,