]>
Commit | Line | Data |
---|---|---|
1 | Index: qpid/cpp/include/qmf/BrokerImportExport.h | |
2 | =================================================================== | |
3 | --- qpid/cpp/include/qmf/BrokerImportExport.h (revision 0) | |
4 | +++ qpid/cpp/include/qmf/BrokerImportExport.h (revision 0) | |
5 | @@ -0,0 +1,42 @@ | |
6 | +#ifndef QPID_BROKER_IMPORT_EXPORT_H | |
7 | +#define QPID_BROKER_IMPORT_EXPORT_H | |
8 | + | |
9 | +/* | |
10 | + * Licensed to the Apache Software Foundation (ASF) under one | |
11 | + * or more contributor license agreements. See the NOTICE file | |
12 | + * distributed with this work for additional information | |
13 | + * regarding copyright ownership. The ASF licenses this file | |
14 | + * to you under the Apache License, Version 2.0 (the | |
15 | + * "License"); you may not use this file except in compliance | |
16 | + * with the License. You may obtain a copy of the License at | |
17 | + * | |
18 | + * http://www.apache.org/licenses/LICENSE-2.0 | |
19 | + * | |
20 | + * Unless required by applicable law or agreed to in writing, | |
21 | + * software distributed under the License is distributed on an | |
22 | + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |
23 | + * KIND, either express or implied. See the License for the | |
24 | + * specific language governing permissions and limitations | |
25 | + * under the License. | |
26 | + */ | |
27 | + | |
28 | +#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) | |
29 | +# if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS) | |
30 | +# define QPID_BROKER_EXTERN __declspec(dllexport) | |
31 | +# else | |
32 | +# define QPID_BROKER_EXTERN __declspec(dllimport) | |
33 | +# endif | |
34 | +# ifdef _MSC_VER | |
35 | +# define QPID_BROKER_CLASS_EXTERN | |
36 | +# define QPID_BROKER_INLINE_EXTERN QPID_BROKER_EXTERN | |
37 | +# else | |
38 | +# define QPID_BROKER_CLASS_EXTERN QPID_BROKER_EXTERN | |
39 | +# define QPID_BROKER_INLINE_EXTERN | |
40 | +# endif | |
41 | +#else | |
42 | +# define QPID_BROKER_EXTERN | |
43 | +# define QPID_BROKER_CLASS_EXTERN | |
44 | +# define QPID_BROKER_INLINE_EXTERN | |
45 | +#endif | |
46 | + | |
47 | +#endif | |
48 | Index: qpid/cpp/src/CMakeLists.txt | |
49 | =================================================================== | |
50 | --- qpid/cpp/src/CMakeLists.txt (revision 1352588) | |
51 | +++ qpid/cpp/src/CMakeLists.txt (working copy) | |
52 | @@ -1224,6 +1224,7 @@ set (qmf_SOURCES | |
53 | set (qmf_HEADERS | |
54 | ../include/qpid/agent/ManagementAgent.h | |
55 | ../include/qpid/agent/QmfAgentImportExport.h | |
56 | + ../include/qmf/BrokerImportExport.h | |
57 | ) | |
58 | ||
59 | add_msvc_version (qmf library dll) | |
60 | Index: qpid/cpp/src/qmf.mk | |
61 | =================================================================== | |
62 | --- qpid/cpp/src/qmf.mk (revision 1352588) | |
63 | +++ qpid/cpp/src/qmf.mk (working copy) | |
64 | @@ -30,7 +30,8 @@ lib_LTLIBRARIES += \ | |
65 | # | |
66 | QMF_API = \ | |
67 | ../include/qpid/agent/ManagementAgent.h \ | |
68 | - ../include/qpid/agent/QmfAgentImportExport.h | |
69 | + ../include/qpid/agent/QmfAgentImportExport.h \ | |
70 | + ../include/qmf/BrokerImportExport.h | |
71 | ||
72 | # | |
73 | # Public headers for the QMF2 API | |
74 | @@ -96,7 +97,6 @@ libqmf2_la_SOURCES = \ | |
75 | qmf/AgentSessionImpl.h \ | |
76 | qmf/AgentSubscription.cpp \ | |
77 | qmf/AgentSubscription.h \ | |
78 | - qmf/BrokerImportExport.h \ | |
79 | qmf/ConsoleEvent.cpp \ | |
80 | qmf/ConsoleEventImpl.h \ | |
81 | qmf/ConsoleSession.cpp \ | |
82 | Index: qpid/cpp/src/qmf/BrokerImportExport.h | |
83 | =================================================================== | |
84 | deleted file mode 100644 | |
85 | --- qpid/cpp/src/qmf/BrokerImportExport.h (revision 1352588) | |
86 | +++ /dev/null (working copy) | |
87 | @@ -1,42 +0,0 @@ | |
88 | -#ifndef QPID_BROKER_IMPORT_EXPORT_H | |
89 | -#define QPID_BROKER_IMPORT_EXPORT_H | |
90 | - | |
91 | -/* | |
92 | - * Licensed to the Apache Software Foundation (ASF) under one | |
93 | - * or more contributor license agreements. See the NOTICE file | |
94 | - * distributed with this work for additional information | |
95 | - * regarding copyright ownership. The ASF licenses this file | |
96 | - * to you under the Apache License, Version 2.0 (the | |
97 | - * "License"); you may not use this file except in compliance | |
98 | - * with the License. You may obtain a copy of the License at | |
99 | - * | |
100 | - * http://www.apache.org/licenses/LICENSE-2.0 | |
101 | - * | |
102 | - * Unless required by applicable law or agreed to in writing, | |
103 | - * software distributed under the License is distributed on an | |
104 | - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | |
105 | - * KIND, either express or implied. See the License for the | |
106 | - * specific language governing permissions and limitations | |
107 | - * under the License. | |
108 | - */ | |
109 | - | |
110 | -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) | |
111 | -# if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS) | |
112 | -# define QPID_BROKER_EXTERN __declspec(dllexport) | |
113 | -# else | |
114 | -# define QPID_BROKER_EXTERN __declspec(dllimport) | |
115 | -# endif | |
116 | -# ifdef _MSC_VER | |
117 | -# define QPID_BROKER_CLASS_EXTERN | |
118 | -# define QPID_BROKER_INLINE_EXTERN QPID_BROKER_EXTERN | |
119 | -# else | |
120 | -# define QPID_BROKER_CLASS_EXTERN QPID_BROKER_EXTERN | |
121 | -# define QPID_BROKER_INLINE_EXTERN | |
122 | -# endif | |
123 | -#else | |
124 | -# define QPID_BROKER_EXTERN | |
125 | -# define QPID_BROKER_CLASS_EXTERN | |
126 | -# define QPID_BROKER_INLINE_EXTERN | |
127 | -#endif | |
128 | - | |
129 | -#endif |