ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-23 23:02:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup, add __BSD__

Browse Source
This commit is contained in:
Adam Ierymenko 2014-07-15 20:49:13 -07:00
parent 49ef980ecf
commit 4c4675e3ac
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node/Constants.hpp
View File

@ -34,35 +34,33 @@
// //
// __LINUX__ // __LINUX__
// __APPLE__ // __APPLE__
// __UNIX_LIKE__ - any "unix like" OS (BSD, posix, etc.) // __BSD__ (OSX also defines this)
// __UNIX_LIKE__ (Linux, BSD, etc.)
// __WINDOWS__ // __WINDOWS__
// //
// Also makes sure __BYTE_ORDER is defined reasonably. // Also makes sure __BYTE_ORDER is defined reasonably.
// //
// Canonicalize Linux... is this necessary? Do it anyway to be defensive.
#if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux) #if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
#ifndef __LINUX__ #ifndef __LINUX__
#define __LINUX__ #define __LINUX__
#endif
#ifndef __UNIX_LIKE__ #ifndef __UNIX_LIKE__
#define __UNIX_LIKE__ #define __UNIX_LIKE__
#endif #endif
#endif #include <endian.h>
#endif #endif
// TODO: Android is what? Linux technically, but does it define it? // TODO: Android is what? Linux technically, but does it define it?
// OSX and iOS are unix-like OSes far as we're concerned
#ifdef __APPLE__ #ifdef __APPLE__
#include <TargetConditionals.h> #include <TargetConditionals.h>
#ifndef __UNIX_LIKE__ #ifndef __UNIX_LIKE__
#define __UNIX_LIKE__ #define __UNIX_LIKE__
#endif #endif
#ifndef __BSD__
#define __BSD__
#endif #endif
// Linux has endian.h
#ifdef __LINUX__
#include <endian.h>
#endif #endif
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
@ -74,6 +72,7 @@
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#pragma warning(disable : 4101) #pragma warning(disable : 4101)
#undef __UNIX_LIKE__ #undef __UNIX_LIKE__
#undef __BSD__
#define ZT_PATH_SEPARATOR '\\' #define ZT_PATH_SEPARATOR '\\'
#define ZT_PATH_SEPARATOR_S "\\" #define ZT_PATH_SEPARATOR_S "\\"
#define ZT_EOL_S "\r\n" #define ZT_EOL_S "\r\n"
@ -98,9 +97,8 @@
#define ZT_EOL_S "\n" #define ZT_EOL_S "\n"
#endif #endif
// Error out if required symbols are missing
#ifndef __BYTE_ORDER #ifndef __BYTE_ORDER
error_no_byte_order_defined; #include <endian.h>
#endif #endif
/** /**