Export symbols for Windows DLL.

torque · torque · commit e1b581b76fda · 2015-02-23T18:52:01.000-08:00
diff --git a/precise-timer/PreciseTimerC.cpp b/precise-timer/PreciseTimerC.cpp
@@ -1,19 +1,19 @@
 #include "PreciseTimer.hpp"
 #include "PreciseTimerC.h"
 extern "C" {
-	CPT* startTimer( void ) {
+	EXPORT CPT* startTimer( void ) {
 		return reinterpret_cast<CPT*>(new PreciseTimer);
 	}
 
-	double getDuration( CPT *pt ) {
+	EXPORT double getDuration( CPT *pt ) {
 		return reinterpret_cast<PreciseTimer*>(pt)->getElapsedTime( );
 	}
 
-	unsigned int version( void ) {
+	EXPORT unsigned int version( void ) {
 		return PreciseTimer::version;
 	}
 
-	void freeTimer( CPT *pt ) {
+	EXPORT void freeTimer( CPT *pt ) {
 		delete reinterpret_cast<PreciseTimer*>(pt);
 	}
 }
diff --git a/precise-timer/PreciseTimerC.h b/precise-timer/PreciseTimerC.h
@@ -1,17 +1,23 @@
 #ifndef PRECISETIMERC_H
 #define PRECISETIMERC_H
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif /*_WIN32*/
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct CPT;
 typedef struct CPT CPT;
 
-CPT* startTimer( void );
-double getDuration( CPT *pt );
-unsigned int version( void );
-void freeTimer( CPT *pt );
+EXPORT CPT* startTimer( void );
+EXPORT double getDuration( CPT *pt );
+EXPORT unsigned int version( void );
+EXPORT void freeTimer( CPT *pt );
 
 #ifdef __cplusplus
 }
diff --git a/threaded-libcurl/DownloadManagerC.cpp b/threaded-libcurl/DownloadManagerC.cpp
@@ -4,55 +4,55 @@
 
 // Avoid symbol mangling.
 extern "C" {
-	CDlM *newDM( void ) {
+	EXPORT CDlM *newDM( void ) {
 		return reinterpret_cast<CDlM*>(new DownloadManager);
 	}
 
-	uint addDownload( CDlM *mgr, const char *url, const char *outfile, const char *sha1) {
+	EXPORT uint addDownload( CDlM *mgr, const char *url, const char *outfile, const char *sha1) {
 		if (NULL == sha1) {
 			return reinterpret_cast<DownloadManager*>(mgr)->addDownload( std::string(url), std::string(outfile) );
 		} else {
 			return reinterpret_cast<DownloadManager*>(mgr)->addDownload( std::string(url), std::string(outfile), std::string(sha1) );
 		}
 	}
 
-	double progress( CDlM *mgr ) {
+	EXPORT double progress( CDlM *mgr ) {
 		return reinterpret_cast<DownloadManager*>(mgr)->getProgress( );
 	}
 
-	int busy( CDlM *mgr ) {
+	EXPORT int busy( CDlM *mgr ) {
 		return reinterpret_cast<DownloadManager*>(mgr)->busy( );
 	}
 
-	int checkDownload( CDlM *mgr, uint i ) {
+	EXPORT int checkDownload( CDlM *mgr, uint i ) {
 		return reinterpret_cast<DownloadManager*>(mgr)->checkDownload( i );
 	}
 
-	const char* getError( CDlM *mgr, uint i ) {
+	EXPORT const char* getError( CDlM *mgr, uint i ) {
 		return reinterpret_cast<DownloadManager*>(mgr)->getError( i );
 	}
 
-	void terminate( CDlM *mgr ) {
+	EXPORT void terminate( CDlM *mgr ) {
 		reinterpret_cast<DownloadManager*>(mgr)->terminate( );
 	}
 
-	void clear( CDlM *mgr ) {
+	EXPORT void clear( CDlM *mgr ) {
 		reinterpret_cast<DownloadManager*>(mgr)->clear( );
 	}
 
-	int checkFileSHA1( const char *filename, const char *expected ) {
+	EXPORT int checkFileSHA1( const char *filename, const char *expected ) {
 		return DownloadManager::checkFileSHA1( std::string( filename ), std::string( expected ) );
 	}
 
-	int checkStringSHA1( const char *string, const char *expected ) {
+	EXPORT int checkStringSHA1( const char *string, const char *expected ) {
 		return DownloadManager::checkStringSHA1( std::string( string ), std::string( expected ) );
 	}
 
-	uint version( void ) {
+	EXPORT uint version( void ) {
 		return DownloadManager::version;
 	}
 
-	void freeDM( CDlM* mgr ) {
+	EXPORT void freeDM( CDlM* mgr ) {
 		delete reinterpret_cast<DownloadManager*>(mgr);
 	}
 }
diff --git a/threaded-libcurl/DownloadManagerC.h b/threaded-libcurl/DownloadManagerC.h
@@ -1,6 +1,12 @@
 #ifndef DOWNLOADMANAGERC_H
 #define DOWNLOADMANAGERC_H
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif /*_WIN32*/
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -9,19 +15,19 @@ struct CDlM;
 typedef struct CDlM CDlM;
 typedef unsigned int uint;
 
-CDlM*       newDM          ( void );
-uint        addDownload    ( CDlM *mgr,           const char *url,
+EXPORT CDlM*       newDM          ( void );
+EXPORT uint        addDownload    ( CDlM *mgr,           const char *url,
                              const char *outfile, const char *sha1 );
-double      progress       ( CDlM *mgr );
-int         busy           ( CDlM *mgr );
-int         checkDownload  ( CDlM *mgr, uint i );
-const char* getError       ( CDlM *mgr, uint i );
-void        terminate      ( CDlM *mgr );
-void        clear          ( CDlM *mgr );
-int         checkFileSHA1  ( const char *filename, const char *expected );
-int         checkStringSHA1( const char *string, const char *expected );
-uint        version        ( void );
-void        freeDM         ( CDlM *mgr );
+EXPORT double      progress       ( CDlM *mgr );
+EXPORT int         busy           ( CDlM *mgr );
+EXPORT int         checkDownload  ( CDlM *mgr, uint i );
+EXPORT const char* getError       ( CDlM *mgr, uint i );
+EXPORT void        terminate      ( CDlM *mgr );
+EXPORT void        clear          ( CDlM *mgr );
+EXPORT int         checkFileSHA1  ( const char *filename, const char *expected );
+EXPORT int         checkStringSHA1( const char *string, const char *expected );
+EXPORT uint        version        ( void );
+EXPORT void        freeDM         ( CDlM *mgr );
 
 #ifdef __cplusplus
 }

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`#include "PreciseTimer.hpp"`
`2`	`2`	`#include "PreciseTimerC.h"`
`3`	`3`	`extern "C" {`
`4`		`- CPT* startTimer( void ) {`
	`4`	`+ EXPORT CPT* startTimer( void ) {`
`5`	`5`	`return reinterpret_cast<CPT*>(new PreciseTimer);`
`6`	`6`	`}`
`7`	`7`
`8`		`- double getDuration( CPT *pt ) {`
	`8`	`+ EXPORT double getDuration( CPT *pt ) {`
`9`	`9`	`return reinterpret_cast<PreciseTimer*>(pt)->getElapsedTime( );`
`10`	`10`	`}`
`11`	`11`
`12`		`- unsigned int version( void ) {`
	`12`	`+ EXPORT unsigned int version( void ) {`
`13`	`13`	`return PreciseTimer::version;`
`14`	`14`	`}`
`15`	`15`
`16`		`- void freeTimer( CPT *pt ) {`
	`16`	`+ EXPORT void freeTimer( CPT *pt ) {`
`17`	`17`	`delete reinterpret_cast<PreciseTimer*>(pt);`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,55 +4,55 @@`
`4`	`4`
`5`	`5`	`// Avoid symbol mangling.`
`6`	`6`	`extern "C" {`
`7`		`- CDlM *newDM( void ) {`
	`7`	`+ EXPORT CDlM *newDM( void ) {`
`8`	`8`	`return reinterpret_cast<CDlM*>(new DownloadManager);`
`9`	`9`	`}`
`10`	`10`
`11`		`- uint addDownload( CDlM mgr, const char url, const char outfile, const char sha1) {`
	`11`	`+ EXPORT uint addDownload( CDlM mgr, const char url, const char outfile, const char sha1) {`
`12`	`12`	`if (NULL == sha1) {`
`13`	`13`	`return reinterpret_cast<DownloadManager*>(mgr)->addDownload( std::string(url), std::string(outfile) );`
`14`	`14`	`} else {`
`15`	`15`	`return reinterpret_cast<DownloadManager*>(mgr)->addDownload( std::string(url), std::string(outfile), std::string(sha1) );`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`- double progress( CDlM *mgr ) {`
	`19`	`+ EXPORT double progress( CDlM *mgr ) {`
`20`	`20`	`return reinterpret_cast<DownloadManager*>(mgr)->getProgress( );`
`21`	`21`	`}`
`22`	`22`
`23`		`- int busy( CDlM *mgr ) {`
	`23`	`+ EXPORT int busy( CDlM *mgr ) {`
`24`	`24`	`return reinterpret_cast<DownloadManager*>(mgr)->busy( );`
`25`	`25`	`}`
`26`	`26`
`27`		`- int checkDownload( CDlM *mgr, uint i ) {`
	`27`	`+ EXPORT int checkDownload( CDlM *mgr, uint i ) {`
`28`	`28`	`return reinterpret_cast<DownloadManager*>(mgr)->checkDownload( i );`
`29`	`29`	`}`
`30`	`30`
`31`		`- const char* getError( CDlM *mgr, uint i ) {`
	`31`	`+ EXPORT const char* getError( CDlM *mgr, uint i ) {`
`32`	`32`	`return reinterpret_cast<DownloadManager*>(mgr)->getError( i );`
`33`	`33`	`}`
`34`	`34`
`35`		`- void terminate( CDlM *mgr ) {`
	`35`	`+ EXPORT void terminate( CDlM *mgr ) {`
`36`	`36`	`reinterpret_cast<DownloadManager*>(mgr)->terminate( );`
`37`	`37`	`}`
`38`	`38`
`39`		`- void clear( CDlM *mgr ) {`
	`39`	`+ EXPORT void clear( CDlM *mgr ) {`
`40`	`40`	`reinterpret_cast<DownloadManager*>(mgr)->clear( );`
`41`	`41`	`}`
`42`	`42`
`43`		`- int checkFileSHA1( const char filename, const char expected ) {`
	`43`	`+ EXPORT int checkFileSHA1( const char filename, const char expected ) {`
`44`	`44`	`return DownloadManager::checkFileSHA1( std::string( filename ), std::string( expected ) );`
`45`	`45`	`}`
`46`	`46`
`47`		`- int checkStringSHA1( const char string, const char expected ) {`
	`47`	`+ EXPORT int checkStringSHA1( const char string, const char expected ) {`
`48`	`48`	`return DownloadManager::checkStringSHA1( std::string( string ), std::string( expected ) );`
`49`	`49`	`}`
`50`	`50`
`51`		`- uint version( void ) {`
	`51`	`+ EXPORT uint version( void ) {`
`52`	`52`	`return DownloadManager::version;`
`53`	`53`	`}`
`54`	`54`
`55`		`- void freeDM( CDlM* mgr ) {`
	`55`	`+ EXPORT void freeDM( CDlM* mgr ) {`
`56`	`56`	`delete reinterpret_cast<DownloadManager*>(mgr);`
`57`	`57`	`}`
`58`	`58`	`}`