Changeset 2237
- Timestamp:
- Jun 6, 2011 9:27:25 AM (10 years ago)
- Location:
- stable/0.7
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/0.7
- Property svn:mergeinfo changed
/trunk merged: 2204,2235
- Property svn:mergeinfo changed
-
stable/0.7/coin.m4
r2231 r2237 3355 3355 m4_toupper($1_DATA_INSTALLED)= 3356 3356 3357 # initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x )3358 projtoprocess="m4_bpatsubsts([$2], [<?>? =[ ]*[^ ]+])"3357 # initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x, != x) 3358 projtoprocess="m4_bpatsubsts([$2], [<?>?!?=[ ]*[^ ]+])" 3359 3359 3360 3360 # we first expand the list of projects to process by adding all dependencies just behind the project which depends on it -
stable/0.7/compile_f2c
- Property svn:mergeinfo changed (with no actual effect on merging)
-
stable/0.7/headers/configall_system_msc.h
r1687 r2237 1 1 /* This is the header file for the Microsoft compiler, defining all 2 2 * system and compiler dependent configuration macros */ 3 4 /*5 Microsoft defines types in BaseTsd.h, part of the Windows SDK. Given6 that this file only gets used in the Visual Studio environment, it7 seems to me we'll be better off simply including it and using the8 types MS defines. But since I have no idea of history here, I'll leave9 all of this inside the guard for MSC_VER >= 1200. If you're reading this10 and have been developing in MSVS long enough to know, fix it. -- lh, 100915 --11 */12 #if _MSC_VER >= 120013 # include <BaseTsd.h>14 #endif15 16 /* Define to 64bit integer types. Note that MS does not provide __uint64. */17 #if _MSC_VER >= 120018 # define COIN_INT64_T INT6419 # define COIN_UINT64_T UINT6420 #else21 # define COIN_INT64_T long long22 # define COIN_UINT64_T unsigned long long23 #endif24 25 /* Define to integer type capturing pointer */26 #define COIN_INTPTR_T ULONG_PTR27 3 28 4 /* 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. */ 49 25 /* #undef FC_DUMMY_MAIN_EQ_F77 */ 50 51 /* Define to the C type corresponding to Fortran INTEGER */52 #define FORTRAN_INTEGER_TYPE int53 26 54 27 /* Define to 1 if you have the <assert.h> header file. */ … … 154 127 #define HAVE__SNPRINTF 1 155 128 156 /* Define to be the name of C-function for Inf check */157 #define MY_C_FINITE _finite158 159 /* Define to be the name of C-function for NaN check */160 #define MY_C_ISNAN _isnan161 162 129 /* The size of a `double', as computed by sizeof. */ 163 130 #define SIZEOF_DOUBLE 8
Note: See TracChangeset
for help on using the changeset viewer.