Changeset 1783 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Nov 22, 2001, 12:33:19 PM (24 years ago)

Author:

aubourg

Message:

pour compilation darwin (MacOS X 10.1.1)

Location:

trunk/SophyaLib/BaseTools

Files:

• machdefs_mkmf.h (modified) (3 diffs)
• ppersist.cc (modified) (2 diffs)
• smathconst.h (modified) (1 diff)

trunk/SophyaLib/BaseTools/machdefs_mkmf.h

@@ -34 +34 @@
 #define MACH_SGI
 #define OS_IRIX64
+#endif
+
+#ifdef __APPLE__
+#ifdef __MACH__
+#define MACH_POWERPC
+#define OS_MACOSX
+#endif
 #endif
 
@@ -174 +181 @@
 #define  SWAP 0
 #define  SWAPDEFAUT   0
+
+#elif defined(OS_MACOSX)
+
+  typedef signed char int_1;
+  typedef unsigned char uint_1;
+  typedef int int_4;
+  typedef unsigned int uint_4;
+  typedef short int_2;
+  typedef unsigned short uint_2;
+  typedef float r_4;
+  typedef double r_8;
+  typedef long long int_8;
+  typedef unsigned long long uint_8;
+
+#define  SWAP 0
+#define  SWAPDEFAUT   0
+
 
 #else
@@ -344 +368 @@
 #endif
 
+#ifdef OS_MACOSX
+#define NO_VALUES_H
+#include "osx_values.h"
+/* Faute de mieux pour le moment : */
+#define drand48() ((double)(random())/LONG_MAX)
+#endif
+
 
 /********************************************************/

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -17 +17 @@
 
 //  strptime n'est pas defini sous Linux  - Reza Mars 2000
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_MACOSX)
 extern "C" {
 char *strptime(char *buf, const char *format, const struct tm *tm);
@@ -430 +430 @@
   rbuf[32] = '\0'; 
   struct tm tm;
-  #ifndef __MWERKS__ 
+  #if !(defined(__MWERKS__) || defined(OS_MACOSX))
   strptime(rbuf,"%d/%m/%Y %H:%M:%S GMT",&tm);
   #else

trunk/SophyaLib/BaseTools/smathconst.h

@@ -4 +4 @@
 
 #include "machdefs.h"
+#ifndef NO_VALUES_H
 #include <values.h>
+#else
+#include <math.h>
+#endif
 
 /* EA conflit entre les diverses copies de nbmath.h, nbconst.h... A nettoyer... */