Changeset 2237

Timestamp:

Jun 6, 2011 9:27:25 AM (9 years ago)

Author:

stefan

Message:

sync with trunk rev2236, incl. chgset2204

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (1 diff)
• compile_f2c (modified) (1 prop)
• headers/configall_system_msc.h (modified) (3 diffs)

stable/0.7/coin.m4

@@ -3355 +3355 @@
 m4_toupper($1_DATA_INSTALLED)=
 
-# initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x)
-projtoprocess="m4_bpatsubsts([$2], [<?>?=[      ]*[^    ]+])"
+# initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x, != x)
+projtoprocess="m4_bpatsubsts([$2], [<?>?!?=[    ]*[^    ]+])"
 
 # we first expand the list of projects to process by adding all dependencies just behind the project which depends on it

stable/0.7/headers/configall_system_msc.h

@@ -1 +1 @@
 /* This is the header file for the Microsoft compiler, defining all
  * system and compiler dependent configuration macros */
-
-/*
-  Microsoft defines types in BaseTsd.h, part of the Windows SDK. Given
-  that this file only gets used in the Visual Studio environment, it
-  seems to me we'll be better off simply including it and using the
-  types MS defines. But since I have no idea of history here, I'll leave
-  all of this inside the guard for MSC_VER >= 1200. If you're reading this
-  and have been developing in MSVS long enough to know, fix it.  -- lh, 100915 --
-*/
-#if _MSC_VER >= 1200
-# include <BaseTsd.h>
-#endif
-
-/* Define to 64bit integer types. Note that MS does not provide __uint64. */
-#if _MSC_VER >= 1200
-# define COIN_INT64_T INT64
-# define COIN_UINT64_T UINT64
-#else
-# define COIN_INT64_T long long
-# define COIN_UINT64_T unsigned long long
-#endif
-
-/* Define to integer type capturing pointer */
-#define COIN_INTPTR_T ULONG_PTR
 
 /* Define to dummy `main' function (if any) required to link to the Fortran
@@ -48 +24 @@
 /* Define if F77 and FC dummy `main' functions are identical. */
 /* #undef FC_DUMMY_MAIN_EQ_F77 */
-
-/* Define to the C type corresponding to Fortran INTEGER */
-#define FORTRAN_INTEGER_TYPE int
 
 /* Define to 1 if you have the <assert.h> header file. */
@@ -154 +127 @@
 #define HAVE__SNPRINTF 1
 
-/* Define to be the name of C-function for Inf check */
-#define MY_C_FINITE _finite
-
-/* Define to be the name of C-function for NaN check */
-#define MY_C_ISNAN _isnan
-
 /* The size of a `double', as computed by sizeof. */
 #define SIZEOF_DOUBLE 8