diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-15 15:06:52 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-15 15:06:52 +0000 |
| commit | 59e48918e7c252926bb5e51a077bcbc8a7eec829 (patch) | |
| tree | f5801b920fd8457d1c3e50576f0106290c66e4cb /listing.c | |
| parent | 0336e043fab6f2a8828d90bc9eef2e23878f6dd1 (diff) | |
| download | xorg-app-xkbcomp-59e48918e7c252926bb5e51a077bcbc8a7eec829.tar.gz | |
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Addedsco_port_update-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1sco_port_update
mingw (Win32) port
Diffstat (limited to 'listing.c')
| -rw-r--r-- | listing.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -112,10 +112,10 @@ SOFTWARE. #endif #ifdef WIN32 -#define BOOL wBOOL #include <windows.h> -#undef BOOL #define FileName(file) file.cFileName +#undef TEXT +#undef ALTERNATE #else #define FileName(file) file->d_name #ifndef X_NOT_POSIX @@ -275,7 +275,7 @@ AddDirectory(char *head,char *ptrn,char *rest,char *map) if (map!=NULL) { tmp= strchr(tmp,')'); if ((tmp==NULL)||(tmp[1]!='\0')) { - ERROR("File and map must have the format file(map)\n"); + ERROR1("File and map must have the format file(map)\n"); return 0; } *map= '\0'; map++; @@ -365,7 +365,7 @@ char *str,*head,*ptrn,*rest= NULL; } if(((rest && ptrn)&&((strchr(ptrn,'(')!=NULL)||(strchr(ptrn,')')!=NULL)))|| (head && ((strchr(head,'(')!=NULL)||(strchr(head,')')!=NULL)))) { - ERROR("Files/maps to list must have the form file(map)\n"); + ERROR1("Files/maps to list must have the form file(map)\n"); ACTION("Illegal specifier ignored\n"); return 0; } @@ -400,7 +400,7 @@ unsigned oldWarningLevel; char * mapName; if (nFilesListed<1) { - ERROR("Must specify at least one file or pattern to list\n"); + ERROR1("Must specify at least one file or pattern to list\n"); return 0; } if ((!out_name)||((out_name[0]=='-')&&(out_name[1]=='\0'))) |