mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-12 00:51:08 +00:00
Fix for cygwin
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4331 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
91c136b68c
commit
702324e292
2 changed files with 4 additions and 4 deletions
|
@ -56,7 +56,7 @@
|
||||||
#include <base/preface.h>
|
#include <base/preface.h>
|
||||||
|
|
||||||
/* One of these two should have MAXHOSTNAMELEN */
|
/* One of these two should have MAXHOSTNAMELEN */
|
||||||
#ifndef __WIN32__
|
#if !defined(__WIN32__) || defined(__CYGWIN__)
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
@ -348,7 +348,7 @@ extern char** _environ;
|
||||||
#undef main
|
#undef main
|
||||||
int main(int argc, char *argv[], char *env[])
|
int main(int argc, char *argv[], char *env[])
|
||||||
{
|
{
|
||||||
#ifdef __WIN32__
|
#if defined(__WIN32__) && !defined(__CYGWIN__)
|
||||||
WSADATA lpWSAData;
|
WSADATA lpWSAData;
|
||||||
|
|
||||||
// Initialize Windows Sockets
|
// Initialize Windows Sockets
|
||||||
|
@ -431,7 +431,7 @@ int main(int argc, char *argv[], char *env[])
|
||||||
int pid;
|
int pid;
|
||||||
|
|
||||||
#if defined(__WIN32__)
|
#if defined(__WIN32__)
|
||||||
pid = (int)GetCurrentProcessId(),
|
pid = (int)GetCurrentProcessId();
|
||||||
#else
|
#else
|
||||||
pid = (int)getpid();
|
pid = (int)getpid();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include <Foundation/NSDebug.h>
|
#include <Foundation/NSDebug.h>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifndef __WIN32__
|
#if !defined(__WIN32__) || defiend(__CYGWIN__)
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#endif /* !__WIN32__ */
|
#endif /* !__WIN32__ */
|
||||||
|
|
Loading…
Reference in a new issue