Don't duplicate defs of DLL_IMPORT, DLL_API, ModuleDispatchTypes

src/CMakeLists.txt

@@ -179,6 +179,7 @@ list( APPEND SOURCES
       Mix.h
       MixerBoard.cpp
       MixerBoard.h
+      ModuleConstants.h
       ModuleManager.cpp
       ModuleManager.h
       NoteTrack.cpp

src/ModuleConstants.h

@@ -0,0 +1,34 @@
+/**********************************************************************
+
+  Audacity: A Digital Audio Editor
+
+  ModuleConstants.h
+
+  Paul Licameli split from ModuleManager.h
+
+**********************************************************************/
+
+#ifndef __AUDACITY_MODULE_CONSTANTS__
+#define __AUDACITY_MODULE_CONSTANTS__
+
+#define ModuleDispatchName "ModuleDispatch"
+
+#ifdef _MSC_VER
+   #define DLL_API _declspec(dllexport)
+   #define DLL_IMPORT _declspec(dllimport)
+#else
+   #define DLL_API __attribute__ ((visibility("default")))
+   #define DLL_IMPORT
+#endif
+
+enum ModuleDispatchTypes
+{
+   ModuleInitialize,
+   ModuleTerminate,
+   AppInitialized,
+   AppQuiting,
+   ProjectInitialized,
+   ProjectClosing
+};
+
+#endif

src/ModuleManager.h

@@ -30,17 +30,8 @@ wxWindow *  MakeHijackPanel();
 //
 // wxPluginManager would be MUCH better, but it's an "undocumented" framework.
 //
-#define ModuleDispatchName "ModuleDispatch"
 
-typedef enum
-{
-   ModuleInitialize,
-   ModuleTerminate,
-   AppInitialized,
-   AppQuiting,
-   ProjectInitialized,
-   ProjectClosing
-} ModuleDispatchTypes;
+#include "ModuleConstants.h"
 
 typedef int (*fnModuleDispatch)(ModuleDispatchTypes type);