diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-14 21:31:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-14 21:31:09 +0200 |
| commit | 922aaf4e2a38cf1ef58d419f58282b0e682d73d8 (patch) | |
| tree | e5a9cd88bc63db2e25f9ec8a866123a07ebe37d1 /src | |
| parent | Merge pull request #2636 (diff) | |
| parent | make this build on SunOS/Solaris (diff) | |
| download | monero-922aaf4e2a38cf1ef58d419f58282b0e682d73d8.tar.xz | |
Merge pull request #2644
a17efcb0 make this build on SunOS/Solaris (Pavel Maryanov)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/int-util.h | 4 | ||||
| -rw-r--r-- | src/common/util.cpp | 2 | ||||
| -rw-r--r-- | src/crypto/initializer.h | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/common/int-util.h b/src/common/int-util.h index 34288805a..7cec571ad 100644 --- a/src/common/int-util.h +++ b/src/common/int-util.h @@ -40,6 +40,10 @@ #include <byteswap.h> #endif +#if defined(__sun) && defined(__SVR4) +#include <endian.h> +#endif + #if defined(_MSC_VER) #include <stdlib.h> diff --git a/src/common/util.cpp b/src/common/util.cpp index 1e180d325..a13ac6e50 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -405,7 +405,7 @@ namespace tools #else std::string get_nix_version_display_string() { - utsname un; + struct utsname un; if(uname(&un) < 0) return std::string("*nix: failed to get os version"); diff --git a/src/crypto/initializer.h b/src/crypto/initializer.h index 619038ae6..eb1d1c069 100644 --- a/src/crypto/initializer.h +++ b/src/crypto/initializer.h @@ -31,8 +31,13 @@ #pragma once #if defined(__GNUC__) +#if defined(__sun) && defined(__SVR4) +#define INITIALIZER(name) __attribute__((constructor)) static void name(void) +#define FINALIZER(name) __attribute__((destructor)) static void name(void) +#else #define INITIALIZER(name) __attribute__((constructor(101))) static void name(void) #define FINALIZER(name) __attribute__((destructor(101))) static void name(void) +#endif #define REGISTER_FINALIZER(name) ((void) 0) #elif defined(_MSC_VER) |