PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-31 04:44:13 +00:00
Code Issues Releases Activity

* util.cpp : reorder defines

Browse Source
This commit is contained in:
hagen 2015-12-28 00:00:00 +00:00
parent 8e867ab0c0
commit 2dae5bccb2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util.cpp
View File

@ -16,10 +16,7 @@
#include "util.h" #include "util.h"
#include "Log.h" #include "Log.h"
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__) #ifdef WIN32
#include <sys/types.h>
#include <ifaddrs.h>
#elif defined(WIN32)
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -30,7 +27,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma comment(lib, "IPHLPAPI.lib") #pragma comment(lib, "IPHLPAPI.lib")
#endif #endif // _MSC_VER
#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x)) #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
#define FREE(x) HeapFree(GetProcessHeap(), 0, (x)) #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
@ -60,6 +57,9 @@ http://stackoverflow.com/questions/15660203/inet-pton-identifier-not-found */
} }
return 0; return 0;
} }
#else /* !WIN32 => UNIX */
#include <sys/types.h>
#include <ifaddrs.h>
#endif #endif
namespace i2p namespace i2p
@ -229,7 +229,7 @@ namespace filesystem
char localAppData[MAX_PATH]; char localAppData[MAX_PATH];
SHGetFolderPath(NULL, CSIDL_APPDATA, 0, NULL, localAppData); SHGetFolderPath(NULL, CSIDL_APPDATA, 0, NULL, localAppData);
return boost::filesystem::path(std::string(localAppData) + "\\" + appName); return boost::filesystem::path(std::string(localAppData) + "\\" + appName);
#else #else /* UNIX */
if (i2p::util::config::GetArg("-service", 0)) // use system folder if (i2p::util::config::GetArg("-service", 0)) // use system folder
return boost::filesystem::path(std::string ("/var/lib/") + appName); return boost::filesystem::path(std::string ("/var/lib/") + appName);
boost::filesystem::path pathRet; boost::filesystem::path pathRet;
@ -243,11 +243,11 @@ namespace filesystem
pathRet /= "Library/Application Support"; pathRet /= "Library/Application Support";
boost::filesystem::create_directory(pathRet); boost::filesystem::create_directory(pathRet);
return pathRet / appName; return pathRet / appName;
#else #else /* Other Unix */
// Unix // Unix
return pathRet / (std::string (".") + appName); return pathRet / (std::string (".") + appName);
#endif #endif
#endif #endif /* UNIX */
} }
boost::filesystem::path GetCertificatesDir() boost::filesystem::path GetCertificatesDir()