Skip to content

Commit

Permalink
Don't use WXUSINGDLL, use custom flag instead
Browse files Browse the repository at this point in the history
WXUSINGDLL may enabled by build system for something else and may not be what we are wanting for this library. Instead, use more library-specific JSON_USING_DLL and JSON_CREATING_DLL flags to control DLL import/export options. Also, don't use API_EXPORT (might conflict with something else), use JSON_API_EXPORT.
  • Loading branch information
Blake-Madden authored and mtangoo committed Nov 11, 2022
1 parent 0396511 commit 833af93
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/wxSimpleJSON.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
#include <vector>
#endif

#ifdef API_CREATING_DLL
# define API_EXPORT WXEXPORT
#elif defined(WXUSINGDLL)
# define API_EXPORT WXIMPORT
#ifdef JSON_CREATING_DLL
# define JSON_API_EXPORT WXEXPORT
#elif defined(JSON_USING_DLL)
# define JSON_API_EXPORT WXIMPORT
#else /* not making nor using DLL */
# define API_EXPORT
# define JSON_API_EXPORT
#endif

typedef struct cJSON cJSON;

/// @brief Class for reading, parsing, and writing JSON data.
class API_EXPORT wxSimpleJSON
class JSON_API_EXPORT wxSimpleJSON
{
protected:
cJSON *m_d{ nullptr};
Expand Down

0 comments on commit 833af93

Please # to comment.