Improve platform compatibility

Replace a bunch of non-standard defines with standard ones

Don't #define POSIX in public header or test for it.  Fixes #228.
(We shoulkd probably also make this change to Steamworks headers.)

Use IsLinux(), IsPosix(), etc instead of #ifdef LINUX or #ifdef POSIX

Moved some platform socket stuff out of steamnetworkingsockets_platform.h
and into platform_sockets.h.  (none of this is actually particular to
steamnetworkingsockets.)

Some platforms don't have IPv6 support.

Author: zpostfacto

CMakeLists.txt

@@ -158,11 +158,11 @@ function(set_target_common_gns_properties TGT)
 	endif()
 
 	if(CMAKE_SYSTEM_NAME MATCHES Linux)
-		target_compile_definitions(${TGT} PUBLIC POSIX LINUX)
+		target_compile_definitions(${TGT} PUBLIC LINUX)
 	elseif(CMAKE_SYSTEM_NAME MATCHES Darwin)
-		target_compile_definitions(${TGT} PUBLIC POSIX OSX)
+		target_compile_definitions(${TGT} PUBLIC OSX)
 	elseif(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
-		target_compile_definitions(${TGT} PUBLIC POSIX FREEBSD)
+		target_compile_definitions(${TGT} PUBLIC FREEBSD)
 	elseif(CMAKE_SYSTEM_NAME MATCHES Windows)
 		target_compile_definitions(${TGT} PUBLIC _WINDOWS)
 		if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")

examples/example_chat.cpp

@@ -22,7 +22,7 @@
 #include <steam/steam_api.h>
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 	#include <windows.h> // Ug, for NukeProcess -- see below
 #else
 	#include <unistd.h>
@@ -43,7 +43,7 @@ SteamNetworkingMicroseconds g_logTimeZero;
 // down the thread that is reading from stdin.
 static void NukeProcess( int rc )
 {
-	#ifdef WIN32
+	#ifdef _WIN32
 		ExitProcess( rc );
 	#else
 		(void)rc; // Unused formal parameter

examples/trivial_signaling_client.cpp

@@ -14,7 +14,7 @@
 #include <steam/isteamnetworkingutils.h>
 #include <steam/steamnetworkingcustomsignaling.h>
 
-#ifdef POSIX
+#ifdef VALVE_POSIX
 	#include <unistd.h>
 	#include <sys/socket.h>
 	#include <sys/types.h>

include/steam/steamtypes.h

@@ -17,11 +17,13 @@
 typedef unsigned char uint8;
 #endif
 
-#if defined( __GNUC__ ) && !defined(_WIN32) && !defined(POSIX)
+#if ( defined(POSIX) || defined(_POSIX_VERSION) || ( defined( __GNUC__ ) && !defined(_WIN32) ) ) && !defined(VALVE_POSIX)
+	#define VALVE_POSIX 1
+#endif
+#ifdef __GNUC__
 	#if __GNUC__ < 4
 		#error "Steamworks requires GCC 4.X (4.2 or 4.4 have been tested)"
 	#endif
-	#define POSIX 1
 #endif
 
 #if defined(__LP64__) || defined(__x86_64__) || defined(_WIN64) || defined(__aarch64__) || defined(__s390x__)

src/common/crypto_openssl.cpp

@@ -10,7 +10,7 @@
 #define _X86INTRIN_H_INCLUDED
 #endif
 #include "winlite.h"
-#elif defined(POSIX)
+#elif IsPosix()
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -397,7 +397,7 @@ void CCrypto::GenerateRandomBlock( void *pvDest, int cubDest )
 	bool bRtlGenRandomOK = s_pfnRtlGenRandom && ( s_pfnRtlGenRandom( pubDest, (unsigned long)cubDest ) == TRUE );
 	AssertFatal( bRtlGenRandomOK );
 
-#elif defined(POSIX)
+#elif IsPosix()
 
 	// Reading from /dev/urandom is threadsafe, but possibly slow due to a kernel
 	// spinlock or mutex protecting access to the internal PRNG state. In theory,

src/public/minbase/minbase_decls.h

@@ -85,15 +85,15 @@
 
 // Linux had a few areas where it didn't construct objects in the same order that Windows does.
 // So when CVProfile::CVProfile() would access g_pMemAlloc, it would crash because the allocator wasn't initalized yet.
-#if defined( GNUC ) || defined ( COMPILER_GCC ) || defined( COMPILER_SNC )
+#if defined( __GNUC__ ) || defined ( COMPILER_GCC ) || defined( COMPILER_SNC )
 	#define CONSTRUCT_EARLY __attribute__((init_priority(101)))
 #else
 	#define CONSTRUCT_EARLY
 #endif
 
 #ifdef _WIN32
 	#define SELECTANY __declspec(selectany)
-#elif defined(GNUC) || defined ( COMPILER_GCC ) || defined( COMPILER_SNC )
+#elif defined(__GNUC__) || defined ( COMPILER_GCC ) || defined( COMPILER_SNC )
 	#define SELECTANY __attribute__((weak))
 #else
 	#define SELECTANY static
@@ -105,7 +105,7 @@
 #if defined(_WIN32) && !defined(_XBOX)
 #define PLAT_DECL_EXPORT __declspec( dllexport )
 #define PLAT_DECL_IMPORT __declspec( dllimport )
-#elif defined(GNUC) || defined(COMPILER_GCC)
+#elif defined(__GNUC__) || defined(COMPILER_GCC)
 #define PLAT_DECL_EXPORT __attribute__((visibility("default")))
 #define PLAT_DECL_IMPORT
 #elif defined(_XBOX) || defined(COMPILER_SNC)
@@ -156,7 +156,7 @@
 		#define  __stdcall			__attribute__ ((__stdcall__))
 	#endif
     #define FASTCALL
-#elif defined(POSIX)
+#elif IsPosix()
     #define __stdcall
     #define __cdecl
     #define STDCALL
@@ -167,7 +167,7 @@
 	#define NOINLINE			    __declspec(noinline)
 	#define NORETURN				__declspec(noreturn)
 	#define FORCEINLINE			    __forceinline
-#elif defined(GNUC) || defined(COMPILER_GCC) || defined(COMPILER_SNC)
+#elif defined(__GNUC__) || defined(COMPILER_GCC) || defined(COMPILER_SNC)
 	#define NOINLINE				__attribute__ ((noinline))
 	#define NORETURN				__attribute__ ((noreturn))
     #if defined(COMPILER_GCC) || defined(COMPILER_SNC)

src/public/minbase/minbase_identify.h

@@ -48,10 +48,6 @@
 	#endif
 #endif
 
-#if ( defined(LINUX) || defined(OSX) || defined(ANDROID) ) && !defined(POSIX)
-	#define POSIX
-#endif
-
 #if defined(_WIN32) && !defined(WINDED)
 	#if defined(_M_IX86)
 		#define __i386__	1
@@ -110,6 +106,10 @@
 	#define IsRetail() false
 #endif
 
+#ifdef IsPosix
+	#error "Too soon"
+#endif
+
 #ifdef _DEBUG
 	#define IsRelease() false
 	#define IsDebug() true
@@ -122,29 +122,41 @@
 	#define IsXboxOne() true
 	#define IsConsole() true
 #elif defined( NN_NINTENDO_SDK )
-	#if !defined(POSIX) && !defined(_WIN32)
-		#define POSIX
+	#ifndef _WIN32
+		#define IsPosix() true
 	#endif
 	#define IsNintendoSwitch() true
 	#define IsConsole() true
-#elif defined( _PS5 )
-	#ifndef POSIX
-		#define POSIX
-	#endif
+#elif defined( __PROSPERO__ )
+	#define IsPosix() true
 	#define IsPS5() true
 	#define IsConsole() true
+#elif defined( __ORBIS__ )
+	#define IsPosix() true
+	#define IsPS4() true
+	#define IsConsole() true
 #elif defined( _WIN32 )
 	#define IsWindows() true
 	#define IsPC() true
-#elif defined(POSIX)
-	#define IsPC() true
-	#ifdef LINUX
-		#define IsLinux() true
-	#endif
-	#ifdef OSX
+#elif defined( __ANDROID__ ) || defined( ANDROID )
+	#define IsAndroid() true
+	#define IsPosix() true
+#elif defined(__APPLE__)
+	#include <TargetConditionals.h>
+	#if defined( TARGET_OS_MAC )
 		#define SUPPORTS_IOPOLLINGHELPER
 		#define IsOSX() true
+		#define IsPosix() true
+	//#elif defined( TARGET_OS_IPHONE )
+	#else
+		#error "Unsupported platform"
 	#endif
+#elif defined( LINUX ) || defined( __LINUX__ ) || defined(linux) || defined(__linux) || defined(__linux__)
+	#define IsLinux() true
+	#define IsPosix() true
+#elif defined( _POSIX_VERSION ) || defined( POSIX ) || defined( VALVE_POSIX )
+	#define IsPosix() true
+	#define IsPC() true
 #else
 	#error Undefined platform
 #endif
@@ -155,6 +167,9 @@
 #ifndef IsPC
 	#define IsPC() false
 #endif
+#ifndef IsAndroid
+	#define IsAndroid() false
+#endif
 #ifndef IsConsole
 	#define IsConsole() false
 #endif
@@ -164,15 +179,17 @@
 #ifndef IsXboxOne
 	#define IsXboxOne() false
 #endif
+#ifndef IsPS4
+	#define IsPS4() false
+#endif
 #ifndef IsPS5
 	#define IsPS5() false
 #endif
+#define IsPlaystation() ( IsPS4() || IsPS5() )
 #ifndef IsLinux
 	#define IsLinux() false
 #endif
-#ifdef POSIX
-	#define IsPosix() true
-#else
+#ifndef IsPosix
 	#define IsPosix() false
 #endif
 #ifndef IsOSX
@@ -185,13 +202,6 @@
 		#define IsARM() false
 	#endif
 #endif
-#ifndef IsAndroid
-	#ifdef ANDROID
-		#define IsAndroid() true
-	#else
-		#define IsAndroid() false
-	#endif
-#endif
 
 // Detect if RTTI is enabled in the current compile
 #if defined(__clang__)

src/public/minbase/minbase_macros.h

@@ -47,24 +47,26 @@
 
 #if defined(_WIN32)
 #define PLAT_DLL_EXT "dll"
-#elif defined(LINUX)
+#elif IsLinux()
 #define PLAT_DLL_EXT "so"
-#elif defined(OSX)
+#elif IsOSX()
 #define PLAT_DLL_EXT "dylib"
 #endif
 
 #if defined(_WIN32)
 #define PLAT_PATH_SLASH "\\"
-#elif defined(POSIX)
+#elif IsPosix()
 #define PLAT_PATH_SLASH "/"
+#else
+	#error "?"
 #endif
 
 #if defined( _PS3 )
 #include <sysutil/sysutil_gamecontent.h>
 #define PATH_MAX CELL_GAME_PATH_MAX
 #endif
 
-#if (!defined(_WIN32) || defined(WINDED)) && defined(POSIX)
+#if (!defined(_WIN32) || defined(WINDED)) && IsPosix()
 #define MAX_PATH  PATH_MAX
 #define _MAX_PATH PATH_MAX
 #endif
@@ -149,7 +151,7 @@ FORCEINLINE unsigned __int64 PLAT_CPU_TIME()
 }
 
 
-#elif defined(POSIX)
+#elif IsPosix()
 
 #include <sys/time.h>
 
@@ -252,7 +254,7 @@ char (*RtlpNumberOf( UNALIGNED T (&)[N] ))[N];
 #endif
 #endif
 
-#elif defined(LINUX)
+#elif IsLinux()
 
 // On Linux/gcc, RtlpNumberOf doesn't work well with pointers to structs
 // that are defined function locally. Here we have an alternative implementation
@@ -318,7 +320,7 @@ struct ErrorIfIsPointerNotArrayGivenToARRAYSIZE<false>
 #endif
 
 // Don't define for Windows, since it is defined unconditionally in winnt.h.
-#if !defined( UNREFERENCED_PARAMETER ) && !defined( WIN32 )
+#if !defined( UNREFERENCED_PARAMETER ) && !defined( _WIN32 )
 #define UNREFERENCED_PARAMETER(parm) NOTE_UNUSED(parm)
 #endif
 

src/public/minbase/minbase_types.h

@@ -75,7 +75,7 @@ typedef uint32 uint32_t;
 // NOTE: int64_t must match the compiler stdint.h definition
 // and so may not match the Steam int64.  Mixing the two is
 // error-prone so always use the Steam non-_t types in Steam code.
-#if defined(COMPILER_GCC) && defined(PLATFORM_64BITS) && !defined(__MINGW32__) && !defined(OSX) && !(defined(IOS) || defined(TVOS))
+#if defined(COMPILER_GCC) && defined(PLATFORM_64BITS) && !defined(__MINGW32__) && !IsOSX() && !(defined(IOS) || defined(TVOS))
 #define INT64_DIFFERENT_FROM_INT64_T 1
 typedef long int int64_t;
 typedef unsigned long int uint64_t;

src/public/minbase/minbase_warnings.h

@@ -30,7 +30,7 @@
 #pragma GCC diagnostic ignored "-Wtype-limits"
 #endif
 
-#if IsPS5() /* This is the wrong way to detect this.  HALP */
+#if defined( __PROSPERO__ ) || defined( __ORBIS__ ) /* This is the wrong way to detect this.  HALP */
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wreorder-ctor"
 #endif