Changeset 1525

Timestamp:

Aug 12, 2004, 3:14:26 PM (22 years ago)

Author:

desonia

Message:

added underscore prefix for fortran functions.

Location:

trunk/psLib

Files:

• psLib.kdevses (modified) (1 diff)
• src/Makefile.Globals (modified) (2 diffs)
• src/astronomy/slalib.h (modified) (2 diffs)

trunk/psLib/psLib.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="1" >
-  <Doc0 NumberOfViews="1" URL="file:/home/desonia/psLib/src/dataManip/psFFT.h" >
-   <View0 line="54" Type="???" >
-    <AdditionalSettings Top="1" Width="1107" Attach="1" Height="529" Left="1" MinMaxMode="0" />
+ <DocsAndViews NumberOfDocuments="2" >
+  <Doc0 NumberOfViews="1" URL="file:/home/desonia/psLib/src/image/psImageManip.c" >
+   <View0 line="706" Type="???" >
+    <AdditionalSettings Top="2" Width="1059" Attach="1" Height="663" Left="2" MinMaxMode="0" />
    </View0>
   </Doc0>
+  <Doc1 NumberOfViews="1" URL="file:/home/desonia/psLib/test/image/tst_psImageManip.c" >
+   <View0 line="1239" Type="???" >
+    <AdditionalSettings Top="2" Width="1059" Attach="1" Height="663" Left="2" MinMaxMode="0" />
+   </View0>
+  </Doc1>
  </DocsAndViews>
  <pluginList>

trunk/psLib/src/Makefile.Globals

@@ -5 +5 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.16 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-08-13 00:46:18 $
+##  $Revision: 1.17 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-08-13 01:14:26 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
 
 ifneq "$(findstring arwin,$(OSTYPE))" ""
-    CFLAGS += -Wno-long-double -DDARWIN
+    CFLAGS += -Wno-long-double -DDARWIN -DFORTRAN_UNDERSCORE_PREFIX
     CFLAGS_RELOC := $(CFLAGS)
     LDFLAGS := $(LDFLAGS) -lmx

trunk/psLib/src/astronomy/slalib.h

@@ -7 +7 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-13 01:12:50 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-13 01:14:26 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #ifdef FORTRAN_DOUBLE_UNDERSCORE_SUFFIX
 #ifdef FORTRAN_UPPERCASE
-#define slaAoppa SLA_AOPPA__
-#define slaAopqk SLA_AOPQK__
-#define slaOapqk SLA_OAPQK__
+#define slaAoppa _SLA_AOPPA__
+#define slaAopqk _SLA_AOPQK__
+#define slaOapqk _SLA_OAPQK__
 #else
-#define slaAoppa sla_aoppa__
-#define slaAopqk sla_aopqk__
-#define slaOapqk sla_oapqk__
+#define slaAoppa _sla_aoppa__
+#define slaAopqk _sla_aopqk__
+#define slaOapqk _sla_oapqk__
 #endif
 #elseif FORTRAN_NO_UNDERSCORE_SUFFIX
 #ifdef FORTRAN_UPPERCASE
-#define slaAoppa SLA_AOPPA
-#define slaAopqk SLA_AOPQK
-#define slaOapqk SLA_OAPQK
+#define slaAoppa _SLA_AOPPA
+#define slaAopqk _SLA_AOPQK
+#define slaOapqk _SLA_OAPQK
 #else
-#define slaAoppa sla_aoppa
-#define slaAopqk sla_aopqk
-#define slaOapqk sla_oapqk
+#define slaAoppa _sla_aoppa
+#define slaAopqk _sla_aopqk
+#define slaOapqk _sla_oapqk
 #endif
 #else
 #ifdef FORTRAN_UPPERCASE
-#define slaAoppa SLA_AOPPA_
-#define slaAopqk SLA_AOPQK_
-#define slaOapqk SLA_OAPQK_
+#define slaAoppa _SLA_AOPPA_
+#define slaAopqk _SLA_AOPQK_
+#define slaOapqk _SLA_OAPQK_
 #else
-#define slaAoppa sla_aoppa_
-#define slaAopqk sla_aopqk_
-#define slaOapqk sla_oapqk_
+#define slaAoppa _sla_aoppa_
+#define slaAopqk _sla_aopqk_
+#define slaOapqk _sla_oapqk_
 #endif
 #endif