[Plplot-cvs] SF.net SVN: plplot:[10612] trunk/bindings

[<arj...@us...>]

Revision: 10612
          http://plplot.svn.sourceforge.net/plplot/?rev=10612&view=rev
Author:   arjenmarkus
Date:     2009-11-19 08:13:30 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
Adding copies of the PLSLABELFUNC_* functions for compilers that add an extra underscore if the function/routine name already contains an underscore.

Modified Paths:
--------------
    trunk/bindings/f77/plstubs.h
    trunk/bindings/f77/scstubs.c
    trunk/bindings/f95/plstubs.h
    trunk/bindings/f95/scstubs.c

Modified: trunk/bindings/f77/plstubs.h
===================================================================
--- trunk/bindings/f77/plstubs.h	2009-11-18 23:57:43 UTC (rev 10611)
+++ trunk/bindings/f77/plstubs.h	2009-11-19 08:13:30 UTC (rev 10612)
@@ -305,6 +305,7 @@
 #define    PLSHADES7                 FNAME( PLSHADES7, plshades7 )
 #define    PLSLABELFUNC              FNAME( PLSLABELFUNC, plslabelfunc )
 #define    PLSLABELFUNC_NONE         FNAME( PLSLABELFUNC_NONE, plslabelfunc_none )
+#define    PLSLABELFUNC_NONEa        FNAME( PLSLABELFUNC_NONE_, plslabelfunc_none_ )
 #define    PLSMAJ                    FNAME( PLSMAJ, plsmaj )
 #define    PLSMEM                    FNAME( PLSMEM, plsmem )
 #define    PLSMIN                    FNAME( PLSMIN, plsmin )

Modified: trunk/bindings/f77/scstubs.c
===================================================================
--- trunk/bindings/f77/scstubs.c	2009-11-18 23:57:43 UTC (rev 10611)
+++ trunk/bindings/f77/scstubs.c	2009-11-19 08:13:30 UTC (rev 10612)
@@ -860,6 +860,13 @@
 }
 
 void
+PLSLABELFUNC_NONEa( void )
+{
+    pllabelfunc = NULL;
+    c_plslabelfunc( NULL, NULL );
+}
+
+void
 PLSMAJ( PLFLT *def, PLFLT *scale )
 {
     c_plsmaj( *def, *scale );

Modified: trunk/bindings/f95/plstubs.h
===================================================================
--- trunk/bindings/f95/plstubs.h	2009-11-18 23:57:43 UTC (rev 10611)
+++ trunk/bindings/f95/plstubs.h	2009-11-19 08:13:30 UTC (rev 10612)
@@ -314,8 +314,11 @@
 #define    PLSHADES27                FNAME( PLSHADES27, plshades27 )
 #define    PLSHADES7                 FNAME( PLSHADES7, plshades7 )
 #define    PLSLABELFUNC_ON           FNAME( PLSLABELFUNC_ON, plslabelfunc_on )
+#define    PLSLABELFUNC_ONa          FNAME( PLSLABELFUNC_ON_, plslabelfunc_on_ )
 #define    PLSLABELFUNC_OFF          FNAME( PLSLABELFUNC_OFF, plslabelfunc_off )
+#define    PLSLABELFUNC_OFFa         FNAME( PLSLABELFUNC_OFF_, plslabelfunc_off_ )
 #define    PLSLABELFUNC_NONE         FNAME( PLSLABELFUNC_NONE, plslabelfunc_none )
+#define    PLSLABELFUNC_NONEa        FNAME( PLSLABELFUNC_NONE_, plslabelfunc_none_ )
 #define    PLSMAJ                    FNAME( PLSMAJ, plsmaj )
 #define    PLSMEM                    FNAME( PLSMEM, plsmem )
 #define    PLSMIN                    FNAME( PLSMIN, plsmin )

Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c	2009-11-18 23:57:43 UTC (rev 10611)
+++ trunk/bindings/f95/scstubs.c	2009-11-19 08:13:30 UTC (rev 10612)
@@ -910,12 +910,27 @@
 }
 
 void
+PLSLABELFUNC_ONa( void ( STDCALL *labelfunc )( PLINT *, PLFLT *, char *, PLINT * ))
+{
+    pllabelfunc = labelfunc;
+    /* N.B. neglect pointer to additional data for f77 */
+    c_plslabelfunc( pllabelfuncf2c, NULL );
+}
+
+void
 PLSLABELFUNC_OFF( PLINT *dummy )
 {
     pllabelfunc = NULL;
     c_plslabelfunc( NULL, NULL );
 }
 
+void
+PLSLABELFUNC_OFFa( PLINT *dummy )
+{
+    pllabelfunc = NULL;
+    c_plslabelfunc( NULL, NULL );
+}
+
 /* Provided for symmetry with FORTRAN 77 */
 void
 PLSLABELFUNC_NONE( void )
@@ -923,6 +938,12 @@
     pllabelfunc = NULL;
     c_plslabelfunc( NULL, NULL );
 }
+void
+PLSLABELFUNC_NONEa( PLINT * )
+{
+    pllabelfunc = NULL;
+    c_plslabelfunc( NULL, NULL );
+}
 
 void
 PLSMAJ( PLFLT *def, PLFLT *scale )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.