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

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

Revision: 9391
          http://plplot.svn.sourceforge.net/plplot/?rev=9391&view=rev
Author:   arjenmarkus
Date:     2009-01-26 20:15:35 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Correct an interfacing problem that occurred with the Compaq Visual Fortran
compiler - a mismatch in calling conventions associated with the user-defined
functions for example 19

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

Modified: trunk/bindings/f77/scstubs.c
===================================================================
--- trunk/bindings/f77/scstubs.c	2009-01-26 09:25:06 UTC (rev 9390)
+++ trunk/bindings/f77/scstubs.c	2009-01-26 20:15:35 UTC (rev 9391)
@@ -29,8 +29,13 @@
 
 #include "plstubs.h"
 
-static void (*plmapform)(PLINT *, PLFLT *, PLFLT *) ; /* Note: slightly different prototype than
-                                                         (*mapform)! */
+#ifdef CVF
+#define STDCALL __stdcall
+#else
+#define STDCALL
+#endif
+static void (STDCALL *plmapform)(PLINT *, PLFLT *, PLFLT *) ; /* Note: slightly different prototype than
+                                                                 (*mapform)! */
 
 void
 PL_SETCONTLABELFORMAT(PLINT *lexp, PLINT *sigdig)
@@ -753,7 +758,7 @@
 */
 #define    PLSETMAPFORMC	FNAME(PLSETMAPFORMC,plsetmapformc)
 void
-PLSETMAPFORMC( void (*mapform)(PLINT *, PLFLT *, PLFLT *) )
+PLSETMAPFORMC( void (STDCALL *mapform)(PLINT *, PLFLT *, PLFLT *) )
 {
     plmapform = mapform ;
 }

Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c	2009-01-26 09:25:06 UTC (rev 9390)
+++ trunk/bindings/f95/scstubs.c	2009-01-26 20:15:35 UTC (rev 9391)
@@ -29,8 +29,13 @@
 
 #include "plstubs.h"
 
-static void (*plmapform)(PLINT *, PLFLT *, PLFLT *) ; /* Note: slightly different prototype than
-                                                         (*mapform)! */
+#ifdef CVF
+#define STDCALL __stdcall
+#else
+#define STDCALL
+#endif
+static void (STDCALL *plmapform)(PLINT *, PLFLT *, PLFLT *) ; /* Note: slightly different prototype than
+                                                                 (*mapform)! */
 
 void
 PL_SETCONTLABELFORMAT(PLINT *lexp, PLINT *sigdig)
@@ -812,7 +817,7 @@
 */
 #define    PLSETMAPFORMC	FNAME(PLSETMAPFORMC,plsetmapformc)
 void
-PLSETMAPFORMC( void (*mapform)(PLINT *, PLFLT *, PLFLT *) )
+PLSETMAPFORMC( void (STDCALL *mapform)(PLINT *, PLFLT *, PLFLT *) )
 {
     plmapform = mapform ;
 }


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