Changeset 2894
- Timestamp:
- 02/04/05 03:12:15 (4 years ago)
- Files:
-
- cdat/trunk/Packages/cdms/Include/Cdunifmodule.h (modified) (1 diff)
- cdat/trunk/Packages/cdms/Src/Cdunifmodule.c (modified) (1 diff)
- cdat/trunk/Packages/cdtime/Src/cdtimemodule.c (modified) (3 diffs)
- cdat/trunk/libcdms/configure (modified) (8 diffs)
- cdat/trunk/libcdms/configure.in (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cdat/trunk/Packages/cdms/Include/Cdunifmodule.h
r2109 r2894 193 193 194 194 /* Type object declarations */ 195 #if defined(__CYGWIN__) 196 extern PyTypeObject PyCdunifFile_Type; 197 extern PyTypeObject PyCdunifVariable_Type; 198 #else 195 199 extern DL_IMPORT(PyTypeObject) PyCdunifFile_Type; 196 200 extern DL_IMPORT(PyTypeObject) PyCdunifVariable_Type; 201 #endif 197 202 198 203 /* Type check macros */ cdat/trunk/Packages/cdms/Src/Cdunifmodule.c
r2317 r2894 632 632 char *mode; 633 633 { 634 PyCdunifFileObject *self = PyObject_NEW(PyCdunifFileObject, 635 &PyCdunifFile_Type); 634 PyCdunifFileObject *self; 636 635 int rw; 637 636 CuFileType filetype; 638 637 638 self = PyObject_NEW(PyCdunifFileObject, &PyCdunifFile_Type); 639 639 if (self == NULL) 640 640 return NULL; cdat/trunk/Packages/cdtime/Src/cdtimemodule.c
r2109 r2894 802 802 statichere PyTypeObject RelTimeType = { /* main python type-descriptor */ 803 803 /* type header */ /* shared by all instances */ 804 PyObject_HEAD_INIT( &PyType_Type)804 PyObject_HEAD_INIT(NULL) 805 805 0, /* ob_size */ 806 806 "reltime", /* tp_name */ … … 831 831 statichere PyTypeObject CompTimeType = { /* main python type-descriptor */ 832 832 /* type header */ /* shared by all instances */ 833 PyObject_HEAD_INIT( &PyType_Type)833 PyObject_HEAD_INIT(NULL) 834 834 0, /* ob_size */ 835 835 "comptime", /* tp_name */ … … 1059 1059 { 1060 1060 PyObject *m, *d; 1061 1062 /* Initialize type object headers */ 1063 RelTimeType.ob_type = &PyType_Type; 1064 CompTimeType.ob_type = &PyType_Type; 1061 1065 1062 1066 /* create the module and add the functions */ cdat/trunk/libcdms/configure
r2561 r2894 2040 2040 HDF_LIB_OPTIONS="mfhdf -ldf -ljpeg -lz -lm" 2041 2041 ;; 2042 Windows_NT*) 2043 HDF_LIB_OPTIONS="mfhdf -ldf -ljpeg -lz -lm" 2044 ;; 2042 2045 *) 2043 2046 HDF_LIB_OPTIONS="mfhdf -ldf -ljpeg -lz" … … 2161 2164 NC_LIB_OPTIONS=$DODS_LIB_OPTIONS" -lm" 2162 2165 ;; 2166 Windows_NT*) 2167 NC_LIB_OPTIONS=$DODS_LIB_OPTIONS" -lm" 2168 ;; 2163 2169 *) 2164 2170 NC_LIB_OPTIONS=$DODS_LIB_OPTIONS … … 2272 2278 PC_FORT_EXTRA_LIBS=$PC_FORT_EXTRA_LIBS" -L/usr/pgi/linux86/$PGI_VERSION/lib -lpgftnrtl -lpgc -lm" 2273 2279 ;; 2280 Windows_NT*) 2281 PC_FORT_EXTRA_LIBS=$PC_FORT_EXTRA_LIBS" -L/usr/pgi/linux86/$PGI_VERSION/lib -lpgftnrtl -lpgc -lm" 2282 ;; 2274 2283 osf*) 2275 2284 PC_FORT_EXTRA_LIBS=$PC_FORT_EXTRA_LIBS" -lfor -lc -lm" … … 2298 2307 echo "checking that libdrs.a is in $DRSLIB (modify with --with-drslib=DIR)" 2299 2308 case "$OS" in 2309 #--------------- 2300 2310 aix) 2301 2311 echo $ac_n "checking for libdrs.a""... $ac_c" 1>&6 … … 2337 2347 fi 2338 2348 ;; 2349 #--------------- 2339 2350 osf*) 2340 2351 echo $ac_n "checking for libdrs.a""... $ac_c" 1>&6 … … 2376 2387 fi 2377 2388 ;; 2389 #--------------- 2378 2390 linux*) 2379 echo $ac_n "checking for libdrs.a on linux""... $ac_c" 1>&62380 echo "configure:2372: checking for libdrs.a on linux" >&52391 echo $ac_n "checking for libdrs.a on Windows_NT""... $ac_c" 1>&6 2392 echo "configure:2372: checking for libdrs.a on Windows_NT" >&5 2381 2393 if test -r "$DRSLIB/libdrs.a"; then 2382 2394 for arg in -L$DRSLIB -ldrs; do … … 2415 2427 fi 2416 2428 ;; 2429 #--------------- 2430 Windows_NT*) 2431 echo $ac_n "checking for libdrs.a on Windows_NT""... $ac_c" 1>&6 2432 echo "configure:2372: checking for libdrs.a on Windows_NT" >&5 2433 if test -r "$DRSLIB/libdrs.a"; then 2434 for arg in -L$DRSLIB -ldrs; do 2435 case "$LIBS" in 2436 *$arg*) 2437 ;; 2438 *) 2439 LIBS="${LIBS-} $arg" 2440 ;; 2441 esac 2442 done 2443 2444 for arg in $PC_FORT_EXTRA_LIBS; do 2445 case "$LIBS" in 2446 *$arg*) 2447 ;; 2448 *) 2449 LIBS="${LIBS-} $arg" 2450 ;; 2451 esac 2452 done 2453 2454 for arg in -Ddrs; do 2455 case "$CPPFLAGS" in 2456 *$arg*) 2457 ;; 2458 *) 2459 CPPFLAGS="${CPPFLAGS-} $arg" 2460 ;; 2461 esac 2462 done 2463 2464 echo "$ac_t""yes" 1>&6 2465 else 2466 echo "$ac_t""no" 1>&6 2467 fi 2468 ;; 2469 #--------------- 2417 2470 *) 2418 2471 echo $ac_n "checking for libdrs.a""... $ac_c" 1>&6 … … 2565 2618 ;; 2566 2619 linux) 2620 GRADS_BYTEORDER=0 2621 for arg in -DBYTESWAP -DpgiFortran; do 2622 case "$CPPFLAGS" in 2623 *$arg*) 2624 ;; 2625 *) 2626 CPPFLAGS="${CPPFLAGS-} $arg" 2627 ;; 2628 esac 2629 done 2630 ;; 2631 Windows_NT) 2567 2632 GRADS_BYTEORDER=0 2568 2633 for arg in -DBYTESWAP -DpgiFortran; do cdat/trunk/libcdms/configure.in
r2561 r2894 150 150 ;; 151 151 linux*) 152 HDF_LIB_OPTIONS="mfhdf -ldf -ljpeg -lz -lm" 153 ;; 154 Windows_NT*) 152 155 HDF_LIB_OPTIONS="mfhdf -ldf -ljpeg -lz -lm" 153 156 ;; … … 192 195 NC_LIB_OPTIONS=$DODS_LIB_OPTIONS" -lm" 193 196 ;; 197 Windows_NT*) 198 NC_LIB_OPTIONS=$DODS_LIB_OPTIONS" -lm" 199 ;; 194 200 *) 195 201 NC_LIB_OPTIONS=$DODS_LIB_OPTIONS … … 245 251 PC_ENSURE(CPPFLAGS, -DBYTESWAP -DpgiFortran) dnl 246 252 ;; 253 Windows_NT*) 254 GRADS_BYTEORDER=0 255 dnl PC_ENSURE(CPPFLAGS, -DBYTESWAP -DAbsoftUNIXFortran -D__linux_absoft) dnl 256 PC_ENSURE(CPPFLAGS, -DBYTESWAP -DpgiFortran) dnl 257 ;; 247 258 *ultrix) 248 259 GRADS_BYTEORDER=0