mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-16 22:04:36 +00:00
parent
df71756e3e
commit
f88694fec6
@ -40,9 +40,7 @@
|
||||
#define INCL_WIN
|
||||
#define INCL_WINATOM
|
||||
#define INCL_GPI
|
||||
#define TID OS2TID /* global rename in OS2 H's! */
|
||||
#include <os2.h>
|
||||
#undef TID /* and restore */
|
||||
|
||||
|
||||
/*DAK these are empty.. #include <windef.h> */
|
||||
@ -52,16 +50,15 @@
|
||||
#include <sys\stat.h>
|
||||
#include "dirent.h"
|
||||
|
||||
#ifdef XP_OS2_VACPP
|
||||
/*DSR020697 - now using dirent.h for DIR...*/
|
||||
|
||||
#define _ST_FSTYPSZ 16
|
||||
typedef unsigned long mode_t;
|
||||
typedef long uid_t;
|
||||
typedef long gid_t;
|
||||
#ifndef XP_OS2
|
||||
typedef long off_t;
|
||||
#endif
|
||||
typedef unsigned long nlink_t;
|
||||
#endif
|
||||
|
||||
typedef struct timestruc {
|
||||
time_t tv_sec; /* seconds */
|
||||
|
@ -29,19 +29,23 @@
|
||||
|
||||
/*DSR050297 - this is based on types.h in the TCP/IP headers... */
|
||||
/*I'm not including types.h because that causes all sorts of damage... */
|
||||
#ifndef MAXHOSTNAMELEN
|
||||
#define MAXHOSTNAMELEN 120
|
||||
#endif
|
||||
|
||||
#if defined(XP_OS2_DOUGSOCK)
|
||||
#ifndef BSD_SELECT
|
||||
/*#if defined(XP_OS2_DOUGSOCK)*/
|
||||
#if 1
|
||||
/*#ifndef BSD_SELECT*/
|
||||
#if 0
|
||||
#error you need BSD_SELECT defined in your command line for all files
|
||||
#endif
|
||||
#include <nerrno.h>
|
||||
/*#include <nerrno.h>*/
|
||||
#include <sys\socket.h>
|
||||
#include <sys\select.h>
|
||||
#include <sys\time.h>
|
||||
#include <sys\ioctl.h>
|
||||
#include <netdb.h>
|
||||
#include <utils.h>
|
||||
/*#include <utils.h>*/
|
||||
|
||||
#else
|
||||
/*DSR072196 - replaced many files with pmwsock.h...*/
|
||||
|
@ -186,7 +186,7 @@
|
||||
#endif
|
||||
|
||||
/* this should just go away, as nspr has it. */
|
||||
#if !defined(XP_WIN) && !defined(XP_UNIX)
|
||||
#if !defined(XP_WIN) && !defined(XP_UNIX) && !defined(XP_OS2)
|
||||
typedef int (*FARPROC)();
|
||||
#endif
|
||||
|
||||
@ -197,7 +197,7 @@ typedef int (*FARPROC)();
|
||||
#define MIN(a, b) min((a), (b))
|
||||
#endif
|
||||
|
||||
#if defined(XP_OS2)
|
||||
#if defined(XP_OS2_VACPP)
|
||||
#ifndef MIN
|
||||
#define MIN(a, b) min((a), (b))
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user