Commit 901626d0 authored by fogal1's avatar fogal1

common: indent export macros.

They're about to get a lot more complicated, and it gets difficult
to read otherwise.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7683 18c085ea-50e0-402c-830e-de6fd14e8384
parent c3b8a93c
......@@ -40,21 +40,21 @@
#define AVTEXCEPTION_EXPORTS_H
#if defined(_WIN32)
#if defined(AVTEXCEPTION_EXPORTS) || defined(visitcommon_EXPORTS)
#define AVTEXCEPTION_API __declspec(dllexport)
#else
#define AVTEXCEPTION_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# if defined(AVTEXCEPTION_EXPORTS) || defined(visitcommon_EXPORTS)
# define AVTEXCEPTION_API __declspec(dllexport)
# else
# define AVTEXCEPTION_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define AVTEXCEPTION_API
# define AVTEXCEPTION_API
#endif
#endif
......@@ -40,23 +40,23 @@
#define COMM_EXPORTS_H
#if defined(_WIN32)
#define DESCRIPTOR unsigned int
#if defined(COMM_EXPORTS) || defined(visitcommon_EXPORTS)
#define COMM_API __declspec(dllexport)
#else
#define COMM_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# define DESCRIPTOR unsigned int
# if defined(COMM_EXPORTS) || defined(visitcommon_EXPORTS)
# define COMM_API __declspec(dllexport)
# else
# define COMM_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define DESCRIPTOR int
#define COMM_API
# define DESCRIPTOR int
# define COMM_API
#endif
#endif
......@@ -40,21 +40,21 @@
#define EXPR_EXPORTS_H
#if defined(_WIN32)
#if defined(EXPR_EXPORTS) || defined(visitcommon_EXPORTS)
#define EXPR_API __declspec(dllexport)
#else
#define EXPR_API __declspec(dllimport)
#endif
#ifdef _MSC_VER
# if defined(EXPR_EXPORTS) || defined(visitcommon_EXPORTS)
# define EXPR_API __declspec(dllexport)
# else
# define EXPR_API __declspec(dllimport)
# endif
# ifdef _MSC_VER
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define EXPR_API
# define EXPR_API
#endif
#endif
......@@ -40,21 +40,21 @@
#define MISC_EXPORTS_H
#if defined(_WIN32)
#if defined(MISC_EXPORTS) || defined(visitcommon_EXPORTS)
#define MISC_API __declspec(dllexport)
#else
#define MISC_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# if defined(MISC_EXPORTS) || defined(visitcommon_EXPORTS)
# define MISC_API __declspec(dllexport)
# else
# define MISC_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define MISC_API
# define MISC_API
#endif
#endif
......@@ -40,21 +40,21 @@
#define PARSER_EXPORTS_H
#if defined(_WIN32)
#if defined(PARSER_EXPORTS) || defined(visitcommon_EXPORTS)
#define PARSER_API __declspec(dllexport)
#else
#define PARSER_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# if defined(PARSER_EXPORTS) || defined(visitcommon_EXPORTS)
# define PARSER_API __declspec(dllexport)
# else
# define PARSER_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define PARSER_API
# define PARSER_API
#endif
#endif
......@@ -41,27 +41,27 @@
#if defined(_WIN32)
#if defined(_MSC_VER)
# if defined(_MSC_VER)
// Disable inheritance by dominance warning message.
#pragma warning(disable:4250)
# pragma warning(disable:4250)
// Disable DLL interface warning.
#pragma warning(disable:4251)
#endif
# pragma warning(disable:4251)
# endif
//
// This file makes sure that the entry point to each plugin is exported
// in the DLL. It must be exported to be visible to GetProcAddress.
//
extern "C" __declspec(dllexport) const char *VisItPluginVersion;
#ifdef GENERAL_PLUGIN_EXPORTS
# ifdef GENERAL_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GeneralDatabasePluginInfo* GetGeneralInfo();
#endif
#ifdef MDSERVER_PLUGIN_EXPORTS
# endif
# ifdef MDSERVER_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) MDServerDatabasePluginInfo* GetMDServerInfo();
#endif
#ifdef ENGINE_PLUGIN_EXPORTS
# endif
# ifdef ENGINE_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) EngineDatabasePluginInfo* GetEngineInfo();
#endif
# endif
#endif
#endif
......@@ -45,21 +45,21 @@
// in the DLL. It must be exported to be visible to GetProcAddress.
//
extern "C" __declspec(dllexport) const char *VisItPluginVersion;
#ifdef GENERAL_PLUGIN_EXPORTS
# ifdef GENERAL_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GeneralOperatorPluginInfo* GetGeneralInfo();
#endif
#ifdef GUI_PLUGIN_EXPORTS
# endif
# ifdef GUI_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GUIOperatorPluginInfo* GetGUIInfo();
#endif
#ifdef VIEWER_PLUGIN_EXPORTS
# endif
# ifdef VIEWER_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) ViewerOperatorPluginInfo* GetViewerInfo();
#endif
#ifdef ENGINE_PLUGIN_EXPORTS
# endif
# ifdef ENGINE_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) EngineOperatorPluginInfo* GetEngineInfo();
#endif
#ifdef SCRIPTING_PLUGIN_EXPORTS
# endif
# ifdef SCRIPTING_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) ScriptingOperatorPluginInfo* GetScriptingInfo();
#endif
# endif
#endif
#endif
......@@ -45,21 +45,21 @@
// in the DLL. It must be exported to be visible to GetProcAddress.
//
extern "C" __declspec(dllexport) const char *VisItPluginVersion;
#ifdef GENERAL_PLUGIN_EXPORTS
# ifdef GENERAL_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GeneralPlotPluginInfo* GetGeneralInfo();
#endif
#ifdef GUI_PLUGIN_EXPORTS
# endif
# ifdef GUI_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GUIPlotPluginInfo* GetGUIInfo();
#endif
#ifdef VIEWER_PLUGIN_EXPORTS
# endif
# ifdef VIEWER_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) ViewerPlotPluginInfo* GetViewerInfo();
#endif
#ifdef ENGINE_PLUGIN_EXPORTS
# endif
# ifdef ENGINE_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) EnginePlotPluginInfo* GetEngineInfo();
#endif
#ifdef SCRIPTING_PLUGIN_EXPORTS
# endif
# ifdef SCRIPTING_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) ScriptingPlotPluginInfo* GetScriptingInfo();
#endif
# endif
#endif
#endif
......@@ -40,23 +40,23 @@
#define PLUGIN_EXPORTS_H
#if defined(_WIN32)
#if defined(PLUGIN_EXPORTS) || defined(visitcommon_EXPORTS)
#define PLUGIN_API __declspec(dllexport)
#else
#define PLUGIN_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# if defined(PLUGIN_EXPORTS) || defined(visitcommon_EXPORTS)
# define PLUGIN_API __declspec(dllexport)
# else
# define PLUGIN_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about inheritance by dominance.
#pragma warning(disable:4250)
# pragma warning(disable:4250)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define PLUGIN_API
# define PLUGIN_API
#endif
#endif
......@@ -40,21 +40,21 @@
#define PROXYBASE_EXPORTS_H
#if defined(_WIN32)
#if defined(PROXYBASE_EXPORTS) || defined(visitcommon_EXPORTS)
#define PROXYBASE_API __declspec(dllexport)
#else
#define PROXYBASE_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# if defined(PROXYBASE_EXPORTS) || defined(visitcommon_EXPORTS)
# define PROXYBASE_API __declspec(dllexport)
# else
# define PROXYBASE_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define PROXYBASE_API
# define PROXYBASE_API
#endif
#endif
......@@ -40,21 +40,21 @@
#define STATE_EXPORTS_H
#if defined(_WIN32)
#if defined(STATE_EXPORTS) || defined(visitcommon_EXPORTS)
#define STATE_API __declspec(dllexport)
#else
#define STATE_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# if defined(STATE_EXPORTS) || defined(visitcommon_EXPORTS)
# define STATE_API __declspec(dllexport)
# else
# define STATE_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define STATE_API
# define STATE_API
#endif
#endif
......@@ -40,23 +40,23 @@
#define UTILITY_EXPORTS_H
#if defined(_WIN32)
#if defined(UTILITY_EXPORTS) || defined(visitcommon_EXPORTS)
#define UTILITY_API __declspec(dllexport)
#else
#define UTILITY_API __declspec(dllimport)
#endif
#if defined(_MSC_VER)
# if defined(UTILITY_EXPORTS) || defined(visitcommon_EXPORTS)
# define UTILITY_API __declspec(dllexport)
# else
# define UTILITY_API __declspec(dllimport)
# endif
# if defined(_MSC_VER)
// Turn off warning about lack of DLL interface
#pragma warning(disable:4251)
# pragma warning(disable:4251)
// Turn off warning non-dll class is base for dll-interface class.
#pragma warning(disable:4275)
# pragma warning(disable:4275)
// Turn off warning about void pointer and -> operator
#pragma warning(disable:4284)
# pragma warning(disable:4284)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
#endif
# pragma warning(disable:4786)
# endif
#else
#define UTILITY_API
# define UTILITY_API
#endif
#endif
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