Print

Print
Commit in lcio on MAIN
sio/include/SIO_functions.h+3-31.3 -> 1.4
sio/src/SIO_functions.cc+2-21.4 -> 1.5
src/cpp/GNUmakefile+11.12 -> 1.13
src/cpp/include/SIO/LCSIO.h+1-11.14 -> 1.15
src/cpp/src/SIO/LCSIO.cc+1-11.12 -> 1.13
src/cpp/src/UTIL/lXDR.cc+6-11.1 -> 1.2
+14-8
6 modified files
JM: Made cpp compile work on Mac OS X (Darwin).  Just added some conditional compile options.
lcio/sio/include
SIO_functions.h 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SIO_functions.h	14 May 2004 16:00:46 -0000	1.3
+++ SIO_functions.h	20 Oct 2005 01:46:17 -0000	1.4
@@ -1,5 +1,5 @@

 // ----------------------------------------------------------------------------

-// CVS $Id: SIO_functions.h,v 1.3 2004/05/14 16:00:46 hvogt Exp $

+// CVS $Id: SIO_functions.h,v 1.4 2005/10/20 01:46:17 jeremy Exp $

 // ----------------------------------------------------------------------------
 // => Primitive functions for reading/writing SIO streams         
 // ----------------------------------------------------------------------------

@@ -38,7 +38,7 @@

 // Windows/NT    MIPS          _M_MRX000     VC  compiler  __int64
 // Windows/NT    PPC           _M_PPC        VC  compiler  __int64
 // ----------------------------------------------------------------------------

-#if defined(_AIX)      ||  defined(__alpha__) || defined(__i386__)  || defined(__sparc__) || defined(__x86_64__)

+#if defined(_AIX)      ||  defined(__alpha__) || defined(__i386__)  || defined(__sparc__) || defined(__x86_64__) || defined(__APPLE_CC__)

 // fg: gcc complains about long long - what to do about it ?
 // warning: ANSI C++ does not support `long long'
  #define SIO_64BITINT   long long

@@ -69,7 +69,7 @@

  #define SIO_POINTER_DECL   unsigned SIO_64BITINT
 #endif
 

-#if defined(_AIX)      || defined(__i386__)  || defined(__sparc__) || defined(_M_IX86) || defined(_M_PPC)

+#if defined(_AIX)      || defined(__i386__)  || defined(__sparc__) || defined(_M_IX86) || defined(_M_PPC) || defined(__APPLE_CC__)

  #define SIO_POINTER_DECL   unsigned int
 #endif
lcio/sio/src
SIO_functions.cc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- SIO_functions.cc	14 May 2004 16:00:47 -0000	1.4
+++ SIO_functions.cc	20 Oct 2005 01:46:18 -0000	1.5
@@ -1,5 +1,5 @@

 // ----------------------------------------------------------------------------

-// CVS $Id: SIO_functions.cc,v 1.4 2004/05/14 16:00:47 hvogt Exp $

+// CVS $Id: SIO_functions.cc,v 1.5 2005/10/20 01:46:18 jeremy Exp $

 // ----------------------------------------------------------------------------
 // => Function package for SIO                            
 // ----------------------------------------------------------------------------

@@ -43,7 +43,7 @@

 #define SIO_LITTLE_ENDIAN
 #endif
 

-#if defined(_AIX)      ||   defined(__sparc__) ||   defined(_M_PPC)

+#if defined(_AIX)      ||   defined(__sparc__) ||   defined(_M_PPC) || defined(__APPLE_CC__)

 #define SIO_BIG_ENDIAN
 #endif
lcio/src/cpp
GNUmakefile 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- GNUmakefile	15 Apr 2005 08:37:33 -0000	1.12
+++ GNUmakefile	20 Oct 2005 01:46:18 -0000	1.13
@@ -20,6 +20,7 @@

 
 ifdef LCIODEBUG
  LCIOCPPFLAGS = -g -pg -Wall -pedantic -Wno-long-long -ansi 

+# -E -dM

 else
  LCIOCPPFLAGS = -O3 -Wall -pedantic -Wno-long-long -ansi 
 endif
lcio/src/cpp/include/SIO
LCSIO.h 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- LCSIO.h	15 Apr 2005 08:37:42 -0000	1.14
+++ LCSIO.h	20 Oct 2005 01:46:18 -0000	1.15
@@ -65,7 +65,7 @@

   
     /** Write a vector size to the stream (needed for AMD64 architectures)
      */

-#if defined(__x86_64__)

+#if defined(__x86_64__) || defined(__APPLE_CC__)

     static unsigned int write( SIO_stream* stream , size_t i) ;
 #endif
lcio/src/cpp/src/SIO
LCSIO.cc 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- LCSIO.cc	15 Apr 2005 08:37:49 -0000	1.12
+++ LCSIO.cc	20 Oct 2005 01:46:18 -0000	1.13
@@ -99,7 +99,7 @@

 }
 
 // needed for AMD64 architectures

-#if defined(__x86_64__)

+#if defined(__x86_64__) || defined(__APPLE_CC__)

 unsigned int LCSIO::write( SIO_stream* stream , size_t i){
 
   unsigned int local = i ;
lcio/src/cpp/src/UTIL
lXDR.cc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lXDR.cc	24 Sep 2004 08:16:20 -0000	1.1
+++ lXDR.cc	20 Oct 2005 01:46:19 -0000	1.2
@@ -9,7 +9,12 @@

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#if defined(__linux) || defined(__CYGWIN__)

+
+#if defined(__APPLE_CC__)
+#include "/usr/include/sys/types.h"
+#endif
+
+#if defined(__linux) || defined(__CYGWIN__) || defined(__APPLE_CC__)

 #include <netinet/in.h>
 #endif
 #ifdef _MSC_VER
CVSspam 0.2.8