Change BACKEND_IMPEXP to HAMLIB_CPP_IMPEXP in C++ includes to avoid potential collisions

pull/649/head
Michael Black W9MDB 2021-03-24 08:36:19 -05:00
rodzic f84b704c13
commit 377bea198c
4 zmienionych plików z 12 dodań i 12 usunięć

Wyświetl plik

@ -27,7 +27,7 @@
//! @cond Doxygen_Suppress
class BACKEND_IMPEXP Amplifier
class HAMLIB_CPP_IMPEXP Amplifier
{
private:
AMP *theAmp; // Global ref. to the amp

Wyświetl plik

@ -32,7 +32,7 @@
#if defined(_WIN32) && !defined(__CYGWIN__)
# undef HAMLIB_IMPEXP
# undef BACKEND_IMPEXP
# undef HAMLIB_CPP_IMPEXP
# undef HAMLIB_API
# undef HAMLIB_EXPORT
# undef HAMLIB_EXPORT_VAR
@ -53,15 +53,15 @@
/* HAMLIB_API may be set to __stdcall for VB, .. */
# define HAMLIB_API __cdecl
# ifdef IN_HAMLIB
# define BACKEND_IMPEXP HAMLIB_DLL_EXPORT
# define HAMLIB_CPP_IMPEXP HAMLIB_DLL_EXPORT
# define HAMLIB_IMPEXP HAMLIB_DLL_EXPORT
# else
# define BACKEND_IMPEXP HAMLIB_DLL_IMPORT
# define HAMLIB_CPP_IMPEXP HAMLIB_DLL_IMPORT
# define HAMLIB_IMPEXP HAMLIB_DLL_IMPORT
# endif
# else
/* static build, only export the backend entry points for lt_dlsym */
# define BACKEND_IMPEXP HAMLIB_DLL_EXPORT
# define HAMLIB_CPP_IMPEXP HAMLIB_DLL_EXPORT
# endif
#endif
@ -70,8 +70,8 @@
#if !defined(HAMLIB_IMPEXP)
# define HAMLIB_IMPEXP
#endif
#if !defined(BACKEND_IMPEXP)
# define BACKEND_IMPEXP
#if !defined(HAMLIB_CPP_IMPEXP)
# define HAMLIB_CPP_IMPEXP
#endif
#if !defined(HAMLIB_API)
# define HAMLIB_API
@ -83,8 +83,8 @@
# define HAMLIB_EXPORT_VAR(type) HAMLIB_IMPEXP type
#endif
#if !defined(BACKEND_EXPORT)
# define BACKEND_EXPORT(type) BACKEND_IMPEXP type HAMLIB_API
# define BACKEND_EXPORT(type) HAMLIB_CPP_IMPEXP type HAMLIB_API
#endif
#if !defined(BACKEND_EXPORT_VAR)
# define BACKEND_EXPORT_VAR(type) BACKEND_IMPEXP type
# define BACKEND_EXPORT_VAR(type) HAMLIB_CPP_IMPEXP type
#endif

Wyświetl plik

@ -27,7 +27,7 @@
//! @cond Doxygen_Suppress
class BACKEND_IMPEXP Rig
class HAMLIB_CPP_IMPEXP Rig
{
private:
RIG *theRig; // Global ref. to the rig
@ -251,7 +251,7 @@ extern "C" void exit(int);
//! @cond Doxygen_Suppress
// Forward Declarations
class BACKEND_IMPEXP RigException
class HAMLIB_CPP_IMPEXP RigException
{
public:
const char *message;

Wyświetl plik

@ -27,7 +27,7 @@
//! @cond Doxygen_Suppress
class BACKEND_IMPEXP Rotator
class HAMLIB_CPP_IMPEXP Rotator
{
private:
ROT *theRot; // Global ref. to the rot