|
16088
|
1 |
diff -urN ORBit2-2.14.17/include/orbit/orbit-config.h.in ../../SUNWgnome-component-2.26.1.hacked/i386/ORBit2-2.14.17/include/orbit/orbit-config.h.in
|
|
|
2 |
--- ORBit2-2.14.17/include/orbit/orbit-config.h.in 2008-08-31 15:04:42.000000000 +0100
|
|
|
3 |
+++ ../../SUNWgnome-component-2.26.1.hacked/i386/ORBit2-2.14.17/include/orbit/orbit-config.h.in 2009-07-22 08:45:37.248848000 +0100
|
|
|
4 |
@@ -14,6 +14,20 @@
|
|
|
5 |
* Alignment of CORBA types mapped to C.
|
|
|
6 |
* These have *nothing* to do with CDR alignment.
|
|
|
7 |
*/
|
|
|
8 |
+#if defined (__amd64) || defined(__sparcv9)
|
|
|
9 |
+#define ORBIT_ALIGNOF_CORBA_OCTET 1
|
|
|
10 |
+#define ORBIT_ALIGNOF_CORBA_BOOLEAN 1
|
|
|
11 |
+#define ORBIT_ALIGNOF_CORBA_CHAR 1
|
|
|
12 |
+#define ORBIT_ALIGNOF_CORBA_WCHAR 2
|
|
|
13 |
+#define ORBIT_ALIGNOF_CORBA_SHORT 2
|
|
|
14 |
+#define ORBIT_ALIGNOF_CORBA_LONG 4
|
|
|
15 |
+#define ORBIT_ALIGNOF_CORBA_LONG_LONG 8
|
|
|
16 |
+#define ORBIT_ALIGNOF_CORBA_FLOAT 4
|
|
|
17 |
+#define ORBIT_ALIGNOF_CORBA_DOUBLE 8
|
|
|
18 |
+#define ORBIT_ALIGNOF_CORBA_LONG_DOUBLE 8
|
|
|
19 |
+#define ORBIT_ALIGNOF_CORBA_STRUCT 1
|
|
|
20 |
+#define ORBIT_ALIGNOF_CORBA_POINTER 8
|
|
|
21 |
+#else
|
|
|
22 |
#define ORBIT_ALIGNOF_CORBA_OCTET @ORBIT_ALIGNOF_CORBA_OCTET@
|
|
|
23 |
#define ORBIT_ALIGNOF_CORBA_BOOLEAN @ORBIT_ALIGNOF_CORBA_BOOLEAN@
|
|
|
24 |
#define ORBIT_ALIGNOF_CORBA_CHAR @ORBIT_ALIGNOF_CORBA_CHAR@
|
|
|
25 |
@@ -26,5 +40,6 @@
|
|
|
26 |
#define ORBIT_ALIGNOF_CORBA_LONG_DOUBLE @ORBIT_ALIGNOF_CORBA_LONG_DOUBLE@
|
|
|
27 |
#define ORBIT_ALIGNOF_CORBA_STRUCT @ORBIT_ALIGNOF_CORBA_STRUCT@
|
|
|
28 |
#define ORBIT_ALIGNOF_CORBA_POINTER @ORBIT_ALIGNOF_CORBA_POINTER@
|
|
|
29 |
+#endif
|
|
|
30 |
|
|
|
31 |
#endif
|