diff options
Diffstat (limited to 'xorg-server/xkb')
| -rw-r--r-- | xorg-server/xkb/ddxList.c | 9 | ||||
| -rw-r--r-- | xorg-server/xkb/ddxLoad.c | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/xkb/ddxList.c b/xorg-server/xkb/ddxList.c index 9e67d71e4..e599f9169 100644 --- a/xorg-server/xkb/ddxList.c +++ b/xorg-server/xkb/ddxList.c @@ -44,7 +44,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef WIN32 /* from ddxLoad.c */ -extern const char* Win32TempDir(); +extern const char* Win32TempDir(void); extern int Win32System(const char *cmdline); #undef System #define System Win32System @@ -126,10 +126,11 @@ XkbDDXListComponent( DeviceIntPtr dev, char *file,*map,*tmp,*buf=NULL; FILE *in; Status status; -int rval; Bool haveDir; #ifdef WIN32 char tmpname[PATH_MAX]; +#else +int rval; #endif if ((list->pattern[what]==NULL)||(list->pattern[what][0]=='\0')) @@ -224,9 +225,9 @@ char tmpname[PATH_MAX]; if (!buf) { fclose(in); #ifdef WIN32 - unlink(tmpname); + unlink(tmpname); #endif - return BadAlloc; + return BadAlloc; } while ((status==Success)&&((tmp=fgets(buf,PATH_MAX,in))!=NULL)) { unsigned flags; diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c index ee442d492..219d39c9a 100644 --- a/xorg-server/xkb/ddxLoad.c +++ b/xorg-server/xkb/ddxLoad.c @@ -268,8 +268,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, } free(buf); #ifdef WIN32 - /* remove the temporary file */ - unlink(tmpname); + unlink(tmpname); #endif return TRUE; } |