fxdll.h: revert koolsmoky commit bab2f1c 'use dllimport for __MSC__ imports'
it was wrong, and was causing LNK4049 warnings.
This commit is contained in:
@@ -66,7 +66,7 @@ typedef struct { float r, g, b, a; } FxColor4;
|
||||
# define FX_ENTRY
|
||||
# define FX_CALL
|
||||
# else
|
||||
# define FX_ENTRY __declspec( dllimport )
|
||||
# define FX_ENTRY extern
|
||||
# define FX_CALL __stdcall
|
||||
# endif
|
||||
#elif defined(__WATCOMC__)
|
||||
|
||||
@@ -37,19 +37,15 @@
|
||||
may have changed, so we do not protect this with an #fndef __FXDLL_H__
|
||||
statement like we normally would. */
|
||||
|
||||
|
||||
#ifdef FX_ENTRY
|
||||
#undef FX_ENTRY
|
||||
#endif
|
||||
|
||||
#ifdef FX_CALL
|
||||
#undef FX_CALL
|
||||
#endif
|
||||
|
||||
#ifdef FX_EXPORT
|
||||
#undef FX_EXPORT
|
||||
#endif
|
||||
|
||||
#ifdef FX_CSTYLE
|
||||
#undef FX_CSTYLE
|
||||
#endif
|
||||
@@ -87,13 +83,8 @@
|
||||
#endif /* FX_DLL_ENABLE */
|
||||
|
||||
#else /* FX_DLL_DEFINITION */
|
||||
#if defined(__MSC__)
|
||||
#define FX_ENTRY __declspec( dllimport )
|
||||
#define FX_CALL __stdcall
|
||||
#else
|
||||
#define FX_ENTRY extern
|
||||
#define FX_CALL __stdcall
|
||||
#endif
|
||||
#endif /* FX_DLL_DEFINITION */
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user