Remove old windows support
This commit is contained in:
@@ -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) \
|
||||
|
||||
Reference in New Issue
Block a user