Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[8871] trunk
|
From: <sm...@us...> - 2008-10-10 07:24:35
|
Revision: 8871
http://plplot.svn.sourceforge.net/plplot/?rev=8871&view=rev
Author: smekal
Date: 2008-10-10 07:24:22 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Changed the import/export macros for the driver sources to PLDLLIMPEXP_DRIVER. Added the corresponding code to pldll.h. Compiles on Linux (since I think these macros are ignored anyway - we need to activate the hide attribute).
Modified Paths:
--------------
trunk/drivers/CMakeLists.txt
trunk/drivers/aqt.c
trunk/drivers/cairo.c
trunk/drivers/cgm.c
trunk/drivers/dg300.c
trunk/drivers/gcw.c
trunk/drivers/gd.c
trunk/drivers/gnome.c
trunk/drivers/hpgl.c
trunk/drivers/impress.c
trunk/drivers/linuxvga.c
trunk/drivers/ljii.c
trunk/drivers/ljiip.c
trunk/drivers/mem.c
trunk/drivers/ntk.c
trunk/drivers/null.c
trunk/drivers/pbm.c
trunk/drivers/pdf.c
trunk/drivers/plmeta.c
trunk/drivers/ps.c
trunk/drivers/pstex.c
trunk/drivers/psttf.cc
trunk/drivers/svg.c
trunk/drivers/tek.c
trunk/drivers/tk.c
trunk/drivers/tkwin.c
trunk/drivers/wingcc.c
trunk/drivers/wxwidgets.cpp
trunk/drivers/xfig.c
trunk/drivers/xwin.c
trunk/drivers/xwinttf.c
trunk/include/pldll.h
Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/CMakeLists.txt 2008-10-10 07:24:22 UTC (rev 8871)
@@ -27,7 +27,7 @@
if(ENABLE_DYNDRIVERS)
set_source_files_properties(
get-drv-info.c
- PROPERTIES COMPILE_FLAGS "-I${LTDL_INCLUDE_DIR} -DUSINGPLDLL"
+ PROPERTIES COMPILE_FLAGS "-I${LTDL_INCLUDE_DIR} -DUSINGDLL"
)
include_directories(
@@ -63,13 +63,13 @@
if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
set_source_files_properties(
${${SOURCE_ROOT_NAME}_SOURCE}
- PROPERTIES COMPILE_FLAGS "${${SOURCE_ROOT_NAME}_COMPILE_FLAGS} -DUSINGPLDLL"
+ PROPERTIES COMPILE_FLAGS "${${SOURCE_ROOT_NAME}_COMPILE_FLAGS} -DUSINGDLL"
)
#message("${SOURCE_ROOT_NAME}_COMPILE_FLAGS = ${${SOURCE_ROOT_NAME}_COMPILE_FLAGS}")
else(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
set_source_files_properties(
${${SOURCE_ROOT_NAME}_SOURCE}
- PROPERTIES COMPILE_FLAGS "-DUSINGPLDLL"
+ PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
)
endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE})
Modified: trunk/drivers/aqt.c
===================================================================
--- trunk/drivers/aqt.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/aqt.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -51,7 +51,7 @@
static NSAutoreleasePool *arpool; /* Objective-C autorelease pool */
static id adapter; /* Adapter object */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_aqt = "aqt:AquaTerm (Mac OS X):1:aqt:50:aqt";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_aqt = "aqt:AquaTerm (Mac OS X):1:aqt:50:aqt";
static int currentPlot = 0;
static int maxWindows = 30;
@@ -186,7 +186,7 @@
/* PLplot interface functions */
-PLDLLIMPEXP void plD_dispatch_init_aqt (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_aqt (PLDispatchTable *pdt);
void plD_init_aqt (PLStream *);
void plD_line_aqt (PLStream *, short, short, short, short);
void plD_polyline_aqt (PLStream *, short *, short *, PLINT);
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/cairo.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -99,7 +99,7 @@
#endif
} PLCairo;
-PLDLLIMPEXP const char* plD_DEVICE_INFO_cairo =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_cairo =
#if defined(PLD_xcairo)
"xcairo:Cairo X Windows Driver:1:cairo:59:xcairo\n"
#endif
@@ -838,7 +838,7 @@
static int XScreen;
static Window rootWindow;
-PLDLLIMPEXP void plD_dispatch_init_xcairo (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_xcairo (PLDispatchTable *pdt);
void plD_init_xcairo (PLStream *);
void plD_eop_xcairo (PLStream *);
void plD_tidy_xcairo (PLStream *);
@@ -1169,7 +1169,7 @@
#if defined(PLD_pdfcairo)
-PLDLLIMPEXP void plD_dispatch_init_pdfcairo (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_pdfcairo (PLDispatchTable *pdt);
void plD_init_pdfcairo (PLStream *);
/*---------------------------------------------------------------------
@@ -1241,7 +1241,7 @@
#if defined(PLD_pscairo)
-PLDLLIMPEXP void plD_dispatch_init_pscairo (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_pscairo (PLDispatchTable *pdt);
void plD_init_pscairo (PLStream *);
/*---------------------------------------------------------------------
@@ -1315,7 +1315,7 @@
#if defined(PLD_svgcairo)
-PLDLLIMPEXP void plD_dispatch_init_svgcairo (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_svgcairo (PLDispatchTable *pdt);
void plD_init_svgcairo (PLStream *);
/*---------------------------------------------------------------------
@@ -1405,7 +1405,7 @@
#if defined(PLD_pngcairo)
-PLDLLIMPEXP void plD_dispatch_init_pngcairo (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_pngcairo (PLDispatchTable *pdt);
void plD_init_pngcairo (PLStream *);
void plD_eop_pngcairo (PLStream *);
@@ -1510,7 +1510,7 @@
#if defined(PLD_memcairo)
-PLDLLIMPEXP void plD_dispatch_init_memcairo (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_memcairo (PLDispatchTable *pdt);
void plD_init_memcairo (PLStream *);
void plD_eop_memcairo (PLStream *);
void plD_bop_memcairo (PLStream *);
@@ -1699,7 +1699,7 @@
#if defined(PLD_extcairo)
-PLDLLIMPEXP void plD_dispatch_init_extcairo (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_extcairo (PLDispatchTable *pdt);
void plD_init_extcairo (PLStream *);
void plD_bop_extcairo (PLStream *);
void plD_eop_extcairo (PLStream *);
Modified: trunk/drivers/cgm.c
===================================================================
--- trunk/drivers/cgm.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/cgm.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -81,7 +81,7 @@
#include <cd.h>
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_cgm = "cgm:CGM file:0:cgm:44:cgm";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_cgm = "cgm:CGM file:0:cgm:44:cgm";
/* Prototypes for functions in this file. */
@@ -157,7 +157,7 @@
void plD_esc_cgm (PLStream *, PLINT, void *);
-PLDLLIMPEXP void plD_dispatch_init_cgm( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_cgm( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr = "CGM (Computer Graphics metafile) file";
Modified: trunk/drivers/dg300.c
===================================================================
--- trunk/drivers/dg300.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/dg300.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -10,9 +10,9 @@
#include "drivers.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_dg300 = "dg300:DG300 Terminal:0:dg300:25:dg300";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_dg300 = "dg300:DG300 Terminal:0:dg300:25:dg300";
-PLDLLIMPEXP void plD_dispatch_init_dg ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_dg ( PLDispatchTable *pdt );
void plD_init_dg (PLStream *);
void plD_line_dg (PLStream *, short, short, short, short);
Modified: trunk/drivers/gcw.c
===================================================================
--- trunk/drivers/gcw.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/gcw.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -87,7 +87,7 @@
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_gcw = "gcw:Gnome Canvas Widget:1:gcw:10:gcw";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_gcw = "gcw:Gnome Canvas Widget:1:gcw:10:gcw";
/* Global driver options */
@@ -139,7 +139,7 @@
void plD_state_gcw(PLStream *, PLINT);
void plD_esc_gcw(PLStream *, PLINT, void *);
-PLDLLIMPEXP void plD_dispatch_init_gcw( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_gcw( PLDispatchTable *pdt )
{
#ifdef DEBUG_GCW_1
Modified: trunk/drivers/gd.c
===================================================================
--- trunk/drivers/gd.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/gd.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -132,7 +132,7 @@
* and finally one of each.
*/
-PLDLLIMPEXP const char* plD_DEVICE_INFO_gd =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_gd =
#if defined(PLD_png)
"png:PNG file:0:gd:39:png\n"
#endif
@@ -280,7 +280,7 @@
#ifdef PLD_png
-PLDLLIMPEXP void plD_dispatch_init_png( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_png( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr = "PNG file";
@@ -302,7 +302,7 @@
#ifdef PLD_jpeg
-PLDLLIMPEXP void plD_dispatch_init_jpeg( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_jpeg( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr = "JPEG File";
@@ -324,7 +324,7 @@
#ifdef PLD_gif
-PLDLLIMPEXP void plD_dispatch_init_gif( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_gif( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr = "GIF File";
Modified: trunk/drivers/gnome.c
===================================================================
--- trunk/drivers/gnome.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/gnome.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -39,7 +39,7 @@
#include <unistd.h>
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_gnome = "gnome:Gnome Canvas:1:gnome:6:gnome";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_gnome = "gnome:Gnome Canvas:1:gnome:6:gnome";
/*#undef DEBUG*/
#define DEBUG
@@ -773,7 +773,7 @@
void plD_state_gnome (PLStream *, PLINT);
void plD_esc_gnome (PLStream *, PLINT, void *);
-PLDLLIMPEXP void plD_dispatch_init_gnome( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_gnome( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr = "Gnome Canvas";
Modified: trunk/drivers/hpgl.c
===================================================================
--- trunk/drivers/hpgl.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/hpgl.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -37,7 +37,7 @@
#include "drivers.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_hpgl =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_hpgl =
#if defined(PLD_hp7470)
"hp7470:HP 7470 Plotter File (HPGL Cartridge, Small Plotter):0:hpgl:34:hp7470\n"
#endif
@@ -137,7 +137,7 @@
#ifdef PLD_hp7470
void plD_init_hp7470 (PLStream *);
-PLDLLIMPEXP void plD_dispatch_init_hp7470( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_hp7470( PLDispatchTable *pdt )
{
hpgl_dispatch_init_helper( pdt,
"HP 7470 Plotter File (HPGL Cartridge, Small Plotter)",
@@ -173,7 +173,7 @@
#ifdef PLD_hp7580
void plD_init_hp7580 (PLStream *);
-PLDLLIMPEXP void plD_dispatch_init_hp7580( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_hp7580( PLDispatchTable *pdt )
{
hpgl_dispatch_init_helper( pdt,
"HP 7580 Plotter File (Large Plotter)", "hp7580",
Modified: trunk/drivers/impress.c
===================================================================
--- trunk/drivers/impress.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/impress.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -10,11 +10,11 @@
#include "drivers.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_impress = "imp:Impress File:0:impress:37:imp";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_impress = "imp:Impress File:0:impress:37:imp";
/* Function prototypes */
-PLDLLIMPEXP void plD_dispatch_init_imp ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_imp ( PLDispatchTable *pdt );
void plD_init_imp (PLStream *);
void plD_line_imp (PLStream *, short, short, short, short);
Modified: trunk/drivers/linuxvga.c
===================================================================
--- trunk/drivers/linuxvga.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/linuxvga.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -18,7 +18,7 @@
#include <vga.h>
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_linuxvga = "linuxvga:Linux VGA driver:0:linuxvga:8:vga";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_linuxvga = "linuxvga:Linux VGA driver:0:linuxvga:8:vga";
/* Function prototypes */
@@ -59,7 +59,7 @@
static page_state;
-PLDLLIMPEXP void plD_dispatch_init_vga( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_vga( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr = "Linux console VGA Screen";
Modified: trunk/drivers/ljii.c
===================================================================
--- trunk/drivers/ljii.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/ljii.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -22,12 +22,12 @@
#endif
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_ljii =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_ljii =
"ljii:LaserJet II Bitmap File (150 dpi):0:ljii:33:ljii";
/* Function prototypes */
-PLDLLIMPEXP void plD_dispatch_init_ljii ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_ljii ( PLDispatchTable *pdt );
void plD_init_ljii (PLStream *);
void plD_line_ljii (PLStream *, short, short, short, short);
Modified: trunk/drivers/ljiip.c
===================================================================
--- trunk/drivers/ljiip.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/ljiip.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -27,12 +27,12 @@
#endif
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_ljiip =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_ljiip =
"ljiip:LaserJet IIp/deskjet compressed graphics:0:ljiip:32:ljiip";
/* Function prototypes */
-PLDLLIMPEXP void plD_dispatch_init_ljiip ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_ljiip ( PLDispatchTable *pdt );
void plD_init_ljiip (PLStream *);
void plD_line_ljiip (PLStream *, short, short, short, short);
Modified: trunk/drivers/mem.c
===================================================================
--- trunk/drivers/mem.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/mem.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -21,9 +21,9 @@
#include "drivers.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_mem = "mem:User-supplied memory device:-1:mem:46:mem";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_mem = "mem:User-supplied memory device:-1:mem:46:mem";
-PLDLLIMPEXP void plD_dispatch_init_mem ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_mem ( PLDispatchTable *pdt );
void plD_init_mem (PLStream *);
void plD_line_mem (PLStream *, short, short, short, short);
Modified: trunk/drivers/ntk.c
===================================================================
--- trunk/drivers/ntk.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/ntk.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -34,10 +34,10 @@
#include <tk.h>
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_ntk = "ntk:New tk driver:1:ntk:43:ntk";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_ntk = "ntk:New tk driver:1:ntk:43:ntk";
-PLDLLIMPEXP void plD_dispatch_init_ntk ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_ntk ( PLDispatchTable *pdt );
void plD_init_ntk (PLStream *);
void plD_line_ntk (PLStream *, short, short, short, short);
Modified: trunk/drivers/null.c
===================================================================
--- trunk/drivers/null.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/null.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -10,9 +10,9 @@
#include "drivers.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_null = "null:Null device:-1:null:42:null";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_null = "null:Null device:-1:null:42:null";
-PLDLLIMPEXP void plD_dispatch_init_null ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_null ( PLDispatchTable *pdt );
void plD_init_null (PLStream *);
void plD_line_null (PLStream *, short, short, short, short);
Modified: trunk/drivers/pbm.c
===================================================================
--- trunk/drivers/pbm.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/pbm.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -14,10 +14,10 @@
#include "drivers.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_pbm = "pbm:PDB (PPM) Driver:0:pbm:38:pbm";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_pbm = "pbm:PDB (PPM) Driver:0:pbm:38:pbm";
-PLDLLIMPEXP void plD_dispatch_init_pbm ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_pbm ( PLDispatchTable *pdt );
void plD_init_pbm (PLStream *);
void plD_line_pbm (PLStream *, short, short, short, short);
Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/pdf.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -88,7 +88,7 @@
} pdfdev;
/* local variables */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_pdf = "pdf:Portable Document Format PDF:1:pdf:58:pdf";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_pdf = "pdf:Portable Document Format PDF:1:pdf:58:pdf";
static jmp_buf env;
/***********************************************************************
@@ -103,7 +103,7 @@
static void process_string( PLStream *, EscText * );
/* PLplot interface functions */
-PLDLLIMPEXP void plD_dispatch_init_pdf (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_pdf (PLDispatchTable *pdt);
void plD_init_pdf (PLStream *);
void plD_line_pdf (PLStream *, short, short, short, short);
void plD_polyline_pdf (PLStream *, short *, short *, PLINT);
Modified: trunk/drivers/plmeta.c
===================================================================
--- trunk/drivers/plmeta.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/plmeta.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -37,10 +37,10 @@
#include <string.h>
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_plmeta = "plmeta:PLplot Native Meta-File:0:plmeta:26:plm";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_plmeta = "plmeta:PLplot Native Meta-File:0:plmeta:26:plm";
-PLDLLIMPEXP void plD_dispatch_init_plm ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_plm ( PLDispatchTable *pdt );
void plD_init_plm (PLStream *);
void plD_line_plm (PLStream *, short, short, short, short);
Modified: trunk/drivers/ps.c
===================================================================
--- trunk/drivers/ps.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/ps.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -49,15 +49,15 @@
/* Device info */
-PLDLLIMPEXP const char * plD_DEVICE_INFO_ps =
+PLDLLIMPEXP_DRIVER const char * plD_DEVICE_INFO_ps =
"ps:PostScript File (monochrome):0:ps:29:psm\n"
"psc:PostScript File (color):0:ps:30:psc";
/* Prototypes for functions in this file. */
-PLDLLIMPEXP void plD_dispatch_init_psm ( PLDispatchTable *pdt );
-PLDLLIMPEXP void plD_dispatch_init_psc ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_psm ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_psc ( PLDispatchTable *pdt );
static char *ps_getdate (void);
static void ps_init (PLStream *);
Modified: trunk/drivers/pstex.c
===================================================================
--- trunk/drivers/pstex.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/pstex.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -12,7 +12,7 @@
#include "ps.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_pstex =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_pstex =
"pstex:Combined Postscript/LaTeX files:0:pstex:41:pstex";
/*--------------------------------------------------------------------------*\
@@ -32,7 +32,7 @@
"Color Postscript/LaTeX (color=1|0)"},
{NULL, DRV_INT, NULL, NULL}};
-PLDLLIMPEXP void plD_dispatch_init_pstex( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_pstex( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr ="Combined Postscript/LaTeX files" ;
Modified: trunk/drivers/psttf.cc
===================================================================
--- trunk/drivers/psttf.cc 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/psttf.cc 2008-10-10 07:24:22 UTC (rev 8871)
@@ -56,15 +56,15 @@
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_psttf =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_psttf =
"psttf:PostScript File (monochrome):0:psttf:55:psttfm\n"
"psttfc:PostScript File (color):0:psttf:56:psttfc";
/* Prototypes for functions in this file. */
-PLDLLIMPEXP void plD_dispatch_init_psttfm ( PLDispatchTable *pdt );
-PLDLLIMPEXP void plD_dispatch_init_psttfc ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_psttfm ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_psttfc ( PLDispatchTable *pdt );
static char *ps_getdate (void);
static void ps_init (PLStream *);
Modified: trunk/drivers/svg.c
===================================================================
--- trunk/drivers/svg.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/svg.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -48,7 +48,7 @@
/* local variables */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_svg = "svg:Scalable Vector Graphics (SVG 1.1):1:svg:57:svg";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_svg = "svg:Scalable Vector Graphics (SVG 1.1):1:svg:57:svg";
static int canvasXSize = 0;
static int canvasYSize = 0;
@@ -105,7 +105,7 @@
/* PLplot interface functions */
-PLDLLIMPEXP void plD_dispatch_init_svg (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_svg (PLDispatchTable *pdt);
void plD_init_svg (PLStream *);
void plD_line_svg (PLStream *, short, short, short, short);
void plD_polyline_svg (PLStream *, short *, short *, PLINT);
Modified: trunk/drivers/tek.c
===================================================================
--- trunk/drivers/tek.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/tek.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -23,7 +23,7 @@
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_tek =
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_tek =
#if defined(PLD_conex)
"conex:Conex vt320/tek emulator:1:tek:24:conex\n"
#endif
@@ -178,7 +178,7 @@
pdt->pl_esc = (plD_esc_fp) plD_esc_tek;
}
-PLDLLIMPEXP void plD_dispatch_init_xterm ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_xterm ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"Xterm Window", "xterm",
@@ -186,7 +186,7 @@
(plD_init_fp) plD_init_xterm );
}
-PLDLLIMPEXP void plD_dispatch_init_tekt ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_tekt ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"Tektronix Terminal (4010)", "tekt",
@@ -194,7 +194,7 @@
(plD_init_fp) plD_init_tekt );
}
-PLDLLIMPEXP void plD_dispatch_init_tek4107t ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_tek4107t ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"Tektronix Terminal (4105/4107)", "tek4107t",
@@ -202,7 +202,7 @@
(plD_init_fp) plD_init_tek4107t );
}
-PLDLLIMPEXP void plD_dispatch_init_mskermit ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_mskermit ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"MS-Kermit emulator", "mskermit",
@@ -210,7 +210,7 @@
(plD_init_fp) plD_init_mskermit );
}
-PLDLLIMPEXP void plD_dispatch_init_versaterm( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_versaterm( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"Versaterm vt100/tek emulator", "versaterm",
@@ -218,7 +218,7 @@
(plD_init_fp) plD_init_versaterm );
}
-PLDLLIMPEXP void plD_dispatch_init_vlt ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_vlt ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"VLT vt100/tek emulator", "vlt",
@@ -226,7 +226,7 @@
(plD_init_fp) plD_init_vlt );
}
-PLDLLIMPEXP void plD_dispatch_init_conex ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_conex ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"Conex vt320/tek emulator", "conex",
@@ -234,7 +234,7 @@
(plD_init_fp) plD_init_conex );
}
-PLDLLIMPEXP void plD_dispatch_init_tekf ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_tekf ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"Tektronix File (4010)", "tekf",
@@ -242,7 +242,7 @@
(plD_init_fp) plD_init_tekf );
}
-PLDLLIMPEXP void plD_dispatch_init_tek4107f ( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_tek4107f ( PLDispatchTable *pdt )
{
tek_dispatch_init_helper( pdt,
"Tektronix File (4105/4107)", "tek4107f",
Modified: trunk/drivers/tk.c
===================================================================
--- trunk/drivers/tk.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/tk.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -63,7 +63,7 @@
#endif
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_tk = "tk:Tcl/TK Window:1:tk:7:tk";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_tk = "tk:Tcl/TK Window:1:tk:7:tk";
/* Number of instructions to skip between updates */
@@ -89,7 +89,7 @@
/* Driver entry and dispatch setup */
-PLDLLIMPEXP void plD_dispatch_init_tk ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_tk ( PLDispatchTable *pdt );
void plD_init_tk (PLStream *);
void plD_line_tk (PLStream *, short, short, short, short);
Modified: trunk/drivers/tkwin.c
===================================================================
--- trunk/drivers/tkwin.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/tkwin.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -80,7 +80,7 @@
#endif
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_tkwin = "tkwin:New tk driver:1:tkwin:45:tkwin";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_tkwin = "tkwin:New tk driver:1:tkwin:45:tkwin";
void * ckcalloc(size_t nmemb, size_t size);
@@ -202,7 +202,7 @@
static void StoreCmap1 (PLStream *pls);
static void WaitForPage(PLStream *pls);
-PLDLLIMPEXP void plD_dispatch_init_tkwin ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_tkwin ( PLDispatchTable *pdt );
void plD_init_tkwin (PLStream *);
void plD_line_tkwin (PLStream *, short, short, short, short);
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/wingcc.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -62,7 +62,7 @@
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_wingcc = "wingcc:Win32 (GCC):1:wingcc:9:wingcc";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_wingcc = "wingcc:Win32 (GCC):1:wingcc:9:wingcc";
/* Struct to hold device-specific info. */
@@ -112,7 +112,7 @@
} wingcc_Dev;
-PLDLLIMPEXP void plD_dispatch_init_wingcc ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_wingcc ( PLDispatchTable *pdt );
void plD_init_wingcc (PLStream *);
void plD_line_wingcc (PLStream *, short, short, short, short);
Modified: trunk/drivers/wxwidgets.cpp
===================================================================
--- trunk/drivers/wxwidgets.cpp 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/wxwidgets.cpp 2008-10-10 07:24:22 UTC (rev 8871)
@@ -94,14 +94,14 @@
\*----------------------------------------------------------------------*/
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_wxwidgets = "wxwidgets:wxWidgets DC:1:wxwidgets:51:wxwidgets";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_wxwidgets = "wxwidgets:wxWidgets DC:1:wxwidgets:51:wxwidgets";
/*--------------------------------------------------------------------------*\
* void plD_dispatch_init_wxwidgets( PLDispatchTable *pdt )
*
* Make driver functions known to plplot.
\*--------------------------------------------------------------------------*/
-PLDLLIMPEXP void plD_dispatch_init_wxwidgets( PLDispatchTable *pdt )
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_wxwidgets( PLDispatchTable *pdt )
{
#ifndef ENABLE_DYNDRIVERS
pdt->pl_MenuStr = "wxWidgets DC";
Modified: trunk/drivers/xfig.c
===================================================================
--- trunk/drivers/xfig.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/xfig.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -10,11 +10,11 @@
#include "drivers.h"
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_xfig = "xfig:Fig file:0:xfig:31:xfig";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_xfig = "xfig:Fig file:0:xfig:31:xfig";
/* Function prototypes */
-PLDLLIMPEXP void plD_dispatch_init_xfig ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_xfig ( PLDispatchTable *pdt );
void plD_init_xfig (PLStream *);
void plD_line_xfig (PLStream *, short, short, short, short);
Modified: trunk/drivers/xwin.c
===================================================================
--- trunk/drivers/xwin.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/xwin.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -45,7 +45,7 @@
#endif
/* Device info */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_xwin = "xwin:X-Window (Xlib):1:xwin:5:xw";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_xwin = "xwin:X-Window (Xlib):1:xwin:5:xw";
static int synchronize = 0; /* change to 1 for X synchronized operation */
/* Use "-drvopt sync" cmd line option to set. */
@@ -126,7 +126,7 @@
/* Driver entry and dispatch setup */
-PLDLLIMPEXP void plD_dispatch_init_xw ( PLDispatchTable *pdt );
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_xw ( PLDispatchTable *pdt );
void plD_init_xw (PLStream *);
void plD_line_xw (PLStream *, short, short, short, short);
Modified: trunk/drivers/xwinttf.c
===================================================================
--- trunk/drivers/xwinttf.c 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/drivers/xwinttf.c 2008-10-10 07:24:22 UTC (rev 8871)
@@ -57,7 +57,7 @@
/* local variables */
-PLDLLIMPEXP const char* plD_DEVICE_INFO_xwinttf = "xwinttf:TrueType X Windows Driver:1:xwinttf:59:xwinttf";
+PLDLLIMPEXP_DRIVER const char* plD_DEVICE_INFO_xwinttf = "xwinttf:TrueType X Windows Driver:1:xwinttf:59:xwinttf";
static int currentPage = -1;
static int XScreen;
@@ -126,7 +126,7 @@
/* PLplot interface functions */
-PLDLLIMPEXP void plD_dispatch_init_xwinttf (PLDispatchTable *pdt);
+PLDLLIMPEXP_DRIVER void plD_dispatch_init_xwinttf (PLDispatchTable *pdt);
void plD_init_xwinttf (PLStream *);
void plD_line_xwinttf (PLStream *, short, short, short, short);
void plD_polyline_xwinttf (PLStream *, short *, short *, PLINT);
Modified: trunk/include/pldll.h
===================================================================
--- trunk/include/pldll.h 2008-10-10 06:33:54 UTC (rev 8870)
+++ trunk/include/pldll.h 2008-10-10 07:24:22 UTC (rev 8871)
@@ -74,4 +74,21 @@
#define PLDLLIMPEXP_WX_DATA(type) PLDLLIMPORT type
#endif
+#if defined(aqt_EXPORTS) || defined(cairo_EXPORTS) || defined(cgm_EXPORTS) || \
+ defined(dg300_EXPORTS) || defined(gd_EXPORTS) || defined(gcw_EXPORTS) || \
+ defined(hpgl_EXPORTS) || defined(impress_EXPORTS) || defined(linuxvga_EXPORTS) || \
+ defined(ljii_EXPORTS) || defined(ljiip_EXPORTS) || defined(mem_EXPORTS) || \
+ defined(ntk_EXPORTS) || defined(null_EXPORTS) || defined(pbm_EXPORTS) || \
+ defined(pdf_EXPORTS) || defined(plmeta_EXPORTS) || defined(ps_EXPORTS) || \
+ defined(pstex_EXPORTS) || defined(psttf_EXPORTS) || defined(svg_EXPORTS) || \
+ defined(tek_EXPORTS) || defined(tk_EXPORTS) || defined(tkwin_EXPORTS) || \
+ defined(wingcc_EXPORTS) || defined(wxwidgets_EXPORTS) || defined(xfig_EXPORTS) || \
+ defined(xwin_EXPORTS)
+ #define PLDLLIMPEXP_DRIVER PLDLLEXPORT
+ #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_DRIVER PLDLLIMPORT
+ #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLIMPORT type
+#endif
+
#endif /* __PL_DLL_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|