Commit 93e5e01f authored by rswindell's avatar rswindell
Browse files

Moved DLLCALL and DLLEXPORT definitions to wrapdll.h.

parent 81ad011a
......@@ -39,29 +39,7 @@
#define _DIRWRAP_H
#include "gen_defs.h" /* ulong */
#if defined(DLLEXPORT)
#undef DLLEXPORT
#endif
#if defined(DLLCALL)
#undef DLLCALL
#endif
#if defined(_WIN32)
#if defined(WRAPPER_DLL)
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT __declspec(dllimport)
#endif
#if defined(__BORLANDC__)
#define DLLCALL __stdcall
#else
#define DLLCALL
#endif
#else /* !_WIN32 */
#define DLLEXPORT
#define DLLCALL
#endif
#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
#if defined(__cplusplus)
extern "C" {
......@@ -127,6 +105,8 @@ extern "C" {
/* POSIX Directory Functions */
/*****************************/
#if defined(_MSC_VER)
#include <io.h> /* _finddata_t */
/* dirent structure returned by readdir().
*/
struct dirent
......
......@@ -38,6 +38,8 @@
#ifndef _FILEWRAP_H
#define _FILEWRAP_H
#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
/**********/
/* Macros */
/**********/
......@@ -82,29 +84,6 @@
/* Prototypes */
/**************/
#if defined(DLLEXPORT)
#undef DLLEXPORT
#endif
#if defined(DLLCALL)
#undef DLLCALL
#endif
#if defined(_WIN32)
#if defined(WRAPPER_DLL)
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT __declspec(dllimport)
#endif
#if defined(__BORLANDC__)
#define DLLCALL __stdcall
#else
#define DLLCALL
#endif
#else /* !_WIN32 */
#define DLLEXPORT
#define DLLCALL
#endif
#if defined(__cplusplus)
extern "C" {
#endif
......
......@@ -40,29 +40,7 @@
#include <stdio.h> /* sprintf */
#include "gen_defs.h" /* ulong */
#if defined(DLLEXPORT)
#undef DLLEXPORT
#endif
#if defined(DLLCALL)
#undef DLLCALL
#endif
#if defined(_WIN32)
#if defined(WRAPPER_DLL)
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT __declspec(dllimport)
#endif
#if defined(__BORLANDC__)
#define DLLCALL __stdcall
#else
#define DLLCALL
#endif
#else /* !_WIN32 */
#define DLLEXPORT
#define DLLCALL
#endif
#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
#if defined(__cplusplus)
extern "C" {
......@@ -167,9 +145,7 @@ extern "C" {
#endif
#if defined(__BORLANDC__)
#define xp_random random
#endif
DLLEXPORT int DLLCALL xp_random(int);
#if defined(__cplusplus)
}
......
......@@ -39,29 +39,7 @@
#define _THREADWRAP_H
#include "gen_defs.h" /* HANDLE */
#if defined(DLLEXPORT)
#undef DLLEXPORT
#endif
#if defined(DLLCALL)
#undef DLLCALL
#endif
#if defined(_WIN32)
#if defined(WRAPPER_DLL)
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT __declspec(dllimport)
#endif
#if defined(__BORLANDC__)
#define DLLCALL __stdcall
#else
#define DLLCALL
#endif
#else /* !_WIN32 */
#define DLLEXPORT
#define DLLCALL
#endif
#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
#if defined(__cplusplus)
extern "C" {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment