Revision: 65159
http://sourceforge.net/p/brlcad/code/65159
Author: brlcad
Date: 2015-06-03 03:25:35 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
add support for compiling with the AIX 7.1 compiler/linker
Modified Paths:
--------------
brlcad/trunk/src/other/openNURBS/opennurbs_system.h
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_system.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_system.h 2015-06-02 23:37:44 UTC
(rev 65158)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_system.h 2015-06-03 03:25:35 UTC
(rev 65159)
@@ -115,6 +115,10 @@
#define ON_COMPILER_SUN
#endif
+#if defined(AIX) || defined(_AIX)
+#define ON_COMPILER_AIX
+#endif
+
#if defined(_GNU_SOURCE) && defined(__APPLE__)
/* using Apple's OSX Xcode compiler */
#if !defined(ON_COMPILER_XCODE)
@@ -251,7 +255,6 @@
#include <ctype.h>
/* these are for openindiana (opensolaris fork) */
-#if 0
/* limits.h (sys/syslimits.h) should define this, but some don't */
#ifndef NAME_MAX
# define NAME_MAX 255
@@ -260,9 +263,8 @@
#ifndef isfinite
# define isfinite(x) (fpclassify(x) & (FP_NORMAL | FP_SUBNORMAL | FP_ZERO))
#endif
-#endif
-#if defined(ON_COMPILER_IRIX) || defined(ON_COMPILER_SUN)
+#if defined(ON_COMPILER_IRIX) || defined(ON_COMPILER_SUN) ||
defined(ON_COMPILER_AIX)
#include <alloca.h>
#endif
@@ -278,7 +280,6 @@
// ON_CreateUuid calls Windows's ::UuidCreate() which
// is declared in Rpcdce.h and defined in Rpcrt4.lib.
#include <Rpc.h>
-
#endif
#if defined(ON_COMPILER_GNU)
@@ -358,7 +359,7 @@
// or 64 bits, the ON__INT16, ON__INT32, and ON__INT64
// typedefs are used.
-#if defined(_M_X64) || defined(_WIN64) || defined(__LP64__)
+#if defined(_M_X64) || defined(_WIN64) || defined(__LP64__) ||
defined(__INT64_TYPE__)
// 64 bit (8 byte) pointers
#define ON_SIZEOF_POINTER 8
#define ON_64BIT_POINTER
@@ -421,6 +422,16 @@
// 64 bit unsigned integer
typedef unsigned long long ON__UINT64;
+#elif defined(ON_COMPILER_AIX)
+
+// AIX uses long long
+
+// 64 bit integer
+typedef long long ON__INT64;
+
+// 64 bit unsigned integer
+typedef unsigned long long ON__UINT64;
+
#else
#error Verify that long long is a 64 bit integer with your compiler!
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
