diff options
| author | Keith Packard <keithp@keithp.com> | 2012-07-13 14:36:25 -0700 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-07-17 16:08:04 +0100 |
| commit | 75966a4186955f3a4625e93796145036c5986d2e (patch) | |
| tree | 5c9059a966c0b4866c87152a3a0a6cdb1f18c4d6 /include/os.h | |
| parent | 357ec54f46d31ff77c441c15c322152e04f89a11 (diff) | |
xwin: Clean up os wrappers for System, Popen and Pclose on Windows
Popen and Pclose are never used on Windows, so don't bother to even
try to define them.
System(s) was defined as system(s), but the two users of that
function are in xkb, which carefully redefines that as
Win32System. Move Win32System and Win32TempDir to os/utils.c, renaming
Win32System to be just System, which simplifies the xkb code
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'include/os.h')
| -rw-r--r-- | include/os.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/os.h b/include/os.h index 7701c3977..9e323f331 100644 --- a/include/os.h +++ b/include/os.h @@ -359,9 +359,13 @@ Fopen(const char *, const char *); extern _X_EXPORT int Fclose(pointer); #else -#define System(a) system(a) -#define Popen(a,b) popen(a,b) -#define Pclose(a) pclose(a) + +extern const char * +Win32TempDir(void); + +extern int +System(const char *cmdline); + #define Fopen(a,b) fopen(a,b) #define Fclose(a) fclose(a) #endif |