diff options
Diffstat (limited to 'src/porting.h')
| -rw-r--r-- | src/porting.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/porting.h b/src/porting.h index 3d2677564..2a91fdd06 100644 --- a/src/porting.h +++ b/src/porting.h @@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <unistd.h> #include <stdint.h> //for uintptr_t -#if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE) + #if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE) #define _GNU_SOURCE #endif @@ -371,12 +371,13 @@ float getDisplayDensity(); v2u32 getDisplaySize(); v2u32 getWindowSize(); +std::vector<core::vector3d<u32> > getSupportedVideoModes(); std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers(); 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) @@ -400,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) |