summaryrefslogtreecommitdiff
path: root/src/porting.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-04-18 20:12:14 -0400
committerkwolekr <kwolekr@minetest.net>2015-04-19 16:52:58 -0400
commit386d69533095a6f36d5c3a98f2cd8de20a0132d4 (patch)
tree7f70adbb8079decd34168866c56ac77efe62e24c /src/porting.h
parentf1a41e4f77ce272e8e454710a7a168d95466742c (diff)
downloadminetest-386d69533095a6f36d5c3a98f2cd8de20a0132d4.tar.gz
minetest-386d69533095a6f36d5c3a98f2cd8de20a0132d4.tar.bz2
minetest-386d69533095a6f36d5c3a98f2cd8de20a0132d4.zip
Porting: Refactor initalizePaths()
Add support for Solaris and HP-UX Search additional potential procfs locations for current executable
Diffstat (limited to 'src/porting.h')
-rw-r--r--src/porting.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/porting.h b/src/porting.h
index ddb56cf7d..add3926ea 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -377,7 +377,7 @@ const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type);
const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type);
#endif
-inline const char * getPlatformName()
+inline const char *getPlatformName()
{
return
#if defined(ANDROID)
@@ -401,8 +401,12 @@ inline const char * getPlatformName()
"AIX"
#elif defined(__hpux)
"HP-UX"
-#elif defined(__sun) && defined(__SVR4)
- "Solaris"
+#elif defined(__sun) || defined(sun)
+ #if defined(__SVR4)
+ "Solaris"
+ #else
+ "SunOS"
+ #endif
#elif defined(__CYGWIN__)
"Cygwin"
#elif defined(__unix__) || defined(__unix)