mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Remove old windows support
This commit is contained in:
parent
1610ff3415
commit
d12ad886c1
21 changed files with 14 additions and 932 deletions
|
|
@ -108,14 +108,12 @@
|
|||
|
||||
# undef ctime
|
||||
|
||||
# ifndef _WIN32
|
||||
# define remove(x) unlink(x)
|
||||
# define rename(x,y) ((link(x,y)||remove(x))?-1:0)
|
||||
# endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -138,7 +136,7 @@ replace __PARAM__((const char* newfile, const char* oldfile, int preserve), (new
|
|||
|
||||
#line 1 "../../lib/libpp/ppproto.c"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -155,7 +153,7 @@ static const char id[] = "\n@(#)proto (AT&T Bell Laboratories) 05/09/95\000\n";
|
|||
|
||||
#line 1 "../../lib/libpp/ppfsm.c"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -512,17 +512,6 @@ static int canexecute __PARAM__((char *path, int isfun), (path, isfun)) __OTORP_
|
|||
}
|
||||
else if(stat(path,&statb) < 0)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
/* check for .exe suffix */
|
||||
if(errno==ENOENT)
|
||||
{
|
||||
stakputs(".exe");
|
||||
path = stakptr(PATH_OFFSET);
|
||||
if(stat(path,&statb) < 0)
|
||||
goto err;
|
||||
}
|
||||
else
|
||||
#endif /* _WIN32 */
|
||||
goto err;
|
||||
}
|
||||
errno = EPERM;
|
||||
|
|
|
|||
|
|
@ -617,11 +617,7 @@ __STDPP__directive pragma pp:ignore "string.h"
|
|||
|
||||
/* <unistd.h> */
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <unistd.h>
|
||||
#else
|
||||
#include <ast_unistd.h>
|
||||
#endif
|
||||
#include <ast_botch.h>
|
||||
|
||||
#ifndef STDIN_FILENO
|
||||
|
|
@ -696,8 +692,6 @@ extern __MANGLE__ char* ttyname __PROTO__((int));
|
|||
extern __MANGLE__ int unlink __PROTO__((const char*));
|
||||
extern __MANGLE__ ssize_t write __PROTO__((int, const __V_*, size_t));
|
||||
|
||||
#ifndef _WIN32
|
||||
|
||||
/*
|
||||
* yes, we don't trust anyone's interpretation but our own
|
||||
*/
|
||||
|
|
@ -716,8 +710,6 @@ extern __MANGLE__ long fpathconf __PROTO__((int, int));
|
|||
extern __MANGLE__ long pathconf __PROTO__((const char*, int));
|
||||
extern __MANGLE__ long sysconf __PROTO__((int));
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__STDPP__directive) && defined(__STDPP__ignore)
|
||||
|
||||
__STDPP__directive pragma pp:ignore "unistd.h"
|
||||
|
|
|
|||
|
|
@ -143,18 +143,12 @@ _falsetlocale(int category, const char *name)
|
|||
char *
|
||||
_fallcMapOSLocaleName(char *osname, char *siname)
|
||||
{
|
||||
#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || \
|
||||
defined(WIN32)
|
||||
#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4)
|
||||
|
||||
#ifdef hpux
|
||||
#define SKIPCOUNT 2
|
||||
#define STARTCHAR ':'
|
||||
#define ENDCHAR ';'
|
||||
#elif defined(WIN32)
|
||||
#define SKIPCOUNT 1
|
||||
#define STARTCHAR '='
|
||||
#define ENDCHAR ';'
|
||||
#define WHITEFILL
|
||||
#elif !defined(sun) || defined(SVR4)
|
||||
#define STARTCHAR '/'
|
||||
#define ENDCHAR '/'
|
||||
|
|
|
|||
|
|
@ -58,9 +58,6 @@ OF THIS SOFTWARE.
|
|||
#include "_fallcGeneric.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#ifdef WIN32
|
||||
#define isascii __isascii
|
||||
#endif
|
||||
|
||||
#define CS0 codesets[0] /* Codeset 0 - 7-bit ASCII */
|
||||
#define CS1 codesets[1] /* Codeset 1 - Kanji */
|
||||
|
|
|
|||
|
|
@ -63,9 +63,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include "_fallcGeneric.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#ifdef WIN32
|
||||
#define isascii __isascii
|
||||
#endif
|
||||
|
||||
#define CS0 codesets[0] /* Codeset 0 - 7-bit ASCII */
|
||||
#define CS1 codesets[1] /* Codeset 1 - Kanji */
|
||||
|
|
|
|||
|
|
@ -88,9 +88,6 @@ from the X Consortium.
|
|||
#include <X11/Xlocale.h>
|
||||
#endif
|
||||
#include <X11/Xos.h>
|
||||
#ifdef WIN32
|
||||
#undef close
|
||||
#endif
|
||||
#include "_falutil.h"
|
||||
|
||||
extern void _fallcInitLoader(
|
||||
|
|
@ -139,11 +136,7 @@ Bool _fallcValidModSyntax(char *mods, char **valid_mods)
|
|||
break;
|
||||
for (ptr = valid_mods; *ptr; ptr++) {
|
||||
i = strlen(*ptr);
|
||||
if (strncmp(mods, *ptr, i) || ((mods[i] != '=')
|
||||
#ifdef WIN32
|
||||
&& (mods[i] != '#')
|
||||
#endif
|
||||
))
|
||||
if (strncmp(mods, *ptr, i) || ((mods[i] != '=')))
|
||||
continue;
|
||||
mods = strchr(mods+i+1, '@');
|
||||
break;
|
||||
|
|
@ -173,19 +166,6 @@ _fallcDefaultMapModifiers (XLCd lcd, char *user_mods, char *prog_mods)
|
|||
strcpy(mods, prog_mods);
|
||||
if (user_mods)
|
||||
strcat(mods, user_mods);
|
||||
#ifdef WIN32
|
||||
{
|
||||
char *s;
|
||||
for (s = mods; s = strchr(s, '@'); s++) {
|
||||
for (s++; *s && *s != '='; s++) {
|
||||
if (*s == '#') {
|
||||
*s = '=';
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return mods;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,10 +77,6 @@ from the X Consortium.
|
|||
|
||||
#include "syncx.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#define _XFlush _XFlushIt
|
||||
#endif
|
||||
|
||||
struct _XGC
|
||||
{
|
||||
XExtData *ext_data; /* hook for extension to hang data */
|
||||
|
|
@ -253,14 +249,6 @@ struct _XLockPtrs {
|
|||
|
||||
typedef struct _LockInfoRec *LockInfoPtr;
|
||||
|
||||
#if defined(WIN32) && !defined(_XLIBINT_)
|
||||
#define _XCreateMutex_fn (*_XCreateMutex_fn_p)
|
||||
#define _XFreeMutex_fn (*_XFreeMutex_fn_p)
|
||||
#define _XLockMutex_fn (*_XLockMutex_fn_p)
|
||||
#define _XUnlockMutex_fn (*_XUnlockMutex_fn_p)
|
||||
#define _Xglobal_lock (*_Xglobal_lock_p)
|
||||
#endif
|
||||
|
||||
/* in XlibInt.c */
|
||||
extern void (*_XCreateMutex_fn)(
|
||||
LockInfoPtr /* lock */
|
||||
|
|
|
|||
|
|
@ -62,11 +62,7 @@ from the X Consortium.
|
|||
#include <X11/Xos.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#define OpenFile(name) open((name), O_RDONLY|O_TEXT)
|
||||
#else
|
||||
#define OpenFile(name) open((name), O_RDONLY)
|
||||
#endif
|
||||
#define CloseFile(fd) close((fd))
|
||||
#define ReadFile(fd,buf,size) read((fd), (buf), (size))
|
||||
#define GetSizeOfFile(name,size) \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue