build fix for BSD systems

This commit is contained in:
David Carlier
2017-04-14 20:43:45 +01:00
parent 874d02d7aa
commit 756568ad9c
12 changed files with 29 additions and 33 deletions

View File

@@ -4,7 +4,7 @@
#define GWEN_MACROS_H
#include <stdlib.h>
#include <stdarg.h>
#ifndef __APPLE__
#if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif //__APPLE__
#include <memory.h>
@@ -38,7 +38,7 @@
#define GwenUtil_OutputDebugWideString( lpOutputString ) //wprintf( lpOutputString )
#define GwenUtil_WideStringToFloat( _Str ) wcstof(_Str, NULL)
#elif defined(__linux__)
#elif defined(__linux__) || defined(__OpenBSD__)
#define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf( _DstBuf, _DstSize, _Format, _ArgList )
#define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vswprintf( _DstBuf, _SizeInWords, _Format, _ArgList )

View File

@@ -30,14 +30,7 @@ LIST(APPEND CLSOCKET_SOURCES ${CLSOCKET_HEADERS})
# OS and compiler checks.
if(UNIX)
# linux / normal unix
add_definitions(-D_LINUX)
if(CYGWIN)
# Special Cygwin stuff here
elseif(APPLE)
# Special Apple stuff here
remove_definitions(-D_LINUX)
add_definitions(-D_DARWIN)
endif()
add_definitions(${OSDEF})
elseif(WIN32)
add_definitions(-DWIN32)
SET(PROJECT_LIBS Ws2_32.lib)

View File

@@ -61,7 +61,7 @@ extern "C"
#define __WORDSIZE 32
#endif
#if defined(_LINUX) || defined(_DARWIN)
#if defined(_LINUX) || defined(_DARWIN) || defined(_BSD)
typedef unsigned char uint8;
typedef char int8;
typedef unsigned short uint16;
@@ -176,7 +176,7 @@ extern "C"
#define GETHOSTBYNAME(a) gethostbyname(a)
#endif
#if defined(_LINUX) || defined(_DARWIN)
#if defined(_LINUX) || defined(_DARWIN) || defined(_BSD)
#define ACCEPT(a,b,c) accept(a,b,c)
#define CONNECT(a,b,c) connect(a,b,c)
#define CLOSE(a) close(a)

View File

@@ -49,7 +49,7 @@
#include <stdarg.h>
#include <errno.h>
#if defined(_LINUX) || defined (_DARWIN)
#if defined(_LINUX) || defined (_DARWIN) || defined(_BSD)
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -66,7 +66,7 @@
#ifdef _DARWIN
#include <net/if.h>
#endif
#if defined(_LINUX) || defined (_DARWIN)
#if defined(_LINUX) || defined (_DARWIN) || defined(_BSD)
#include <sys/time.h>
#include <sys/uio.h>
#include <unistd.h>