Commit aa6076815678d06bd4fddecaa3320c79b888c0ee

Authored by Jürgen Knödlseder
1 parent 6a72ca6e

Add the following to enable compilation on Solaris

#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
    typedef uint64_t u_int64_t;
#endif // SOLARIS
include/GInstDir.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include "GBase.hpp"
... ...
include/GResponseCache.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include <map>
... ...
inst/com/include/GCOMInstDir.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include "GInstDir.hpp"
... ...
inst/cta/include/GCTAInstDir.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include "GInstDir.hpp"
... ...
inst/lat/include/GLATInstDir.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include "GInstDir.hpp"
... ...
inst/mwl/include/GMWLInstDir.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include "GInstDir.hpp"
... ...
inst/spi/include/GSPIInstDir.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include "GInstDir.hpp"
... ...
src/template/GXXXInstDir.hpp
... ... @@ -30,7 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <sys/types.h>
33   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  33 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
34 34 typedef uint64_t u_int64_t;
35 35 #endif // SOLARIS
36 36 #include "GInstDir.hpp"
... ...
test/testinst/GTestInstDir.hpp
... ... @@ -25,7 +25,7 @@
25 25 /* __ Includes ___________________________________________________________ */
26 26 #include <string>
27 27 #include <sys/types.h>
28   -#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
  28 +#if defined(__sun) && (defined(__svr4__) || defined(__SVR4)) // SOLARIS
29 29 typedef uint64_t u_int64_t;
30 30 #endif // SOLARIS
31 31 #include "GInstDir.hpp"
... ...