mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00
Code Issues Releases Wiki Activity

* Fix recursive dllmacro.h inclusion.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-01-04 10:12:59 +01:00
parent 08f41b796c
commit 318ed169eb
8 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/win/revision.txt
View File

@@ -1 +1 @@
53 55

2
src/sip/jabber/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ include( ${QT_USE_FILE} )
add_definitions( ${QT_DEFINITIONS} ) add_definitions( ${QT_DEFINITIONS} )
add_definitions( -DQT_PLUGIN ) add_definitions( -DQT_PLUGIN )
add_definitions( -DQT_SHARED ) add_definitions( -DQT_SHARED )
add_definitions( -DDLLEXPORT_PRO ) add_definitions( -DSIPDLLEXPORT_PRO )
set( jabberSources set( jabberSources
jabber.cpp jabber.cpp

4
src/sip/jabber/jabber.h
View File

@@ -4,9 +4,9 @@
#include "sip/SipPlugin.h" #include "sip/SipPlugin.h"
#include "jabber_p.h" #include "jabber_p.h"
#include "dllmacro.h" #include "../sipdllmacro.h"
class DLLEXPORT JabberPlugin : public SipPlugin class SIPDLLEXPORT JabberPlugin : public SipPlugin
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES( SipPlugin ) Q_INTERFACES( SipPlugin )

4
src/sip/jabber/jabber_p.h
View File

@@ -49,9 +49,9 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include "dllmacro.h" #include "../sipdllmacro.h"
class DLLEXPORT Jabber_p : class SIPDLLEXPORT Jabber_p :
public QObject, public QObject,
public gloox::ConnectionListener, public gloox::ConnectionListener,
public gloox::RosterListener, public gloox::RosterListener,

14
src/sip/sipdllmacro.h Normal file
View File

@@ -0,0 +1,14 @@
#ifndef SIPDLLMACRO_H
#define SIPDLLMACRO_H
#ifdef WIN32
#ifdef SIPDLLEXPORT_PRO
#define SIPDLLEXPORT __declspec(dllexport)
#else
#define SIPDLLEXPORT __declspec(dllimport)
#endif
#else
#define SIPDLLEXPORT
#endif
#endif

2
src/sip/zeroconf/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ include( ${QT_USE_FILE} )
add_definitions( ${QT_DEFINITIONS} ) add_definitions( ${QT_DEFINITIONS} )
add_definitions( -DQT_PLUGIN ) add_definitions( -DQT_PLUGIN )
add_definitions( -DQT_SHARED ) add_definitions( -DQT_SHARED )
add_definitions( -DDLLEXPORT_PRO ) add_definitions( -DSIPDLLEXPORT_PRO )
set( zeroconfSources set( zeroconfSources
zeroconf.cpp zeroconf.cpp

6
src/sip/zeroconf/tomahawkzeroconf.h
View File

@@ -13,9 +13,9 @@
#include "database/database.h" #include "database/database.h"
#include "network/servent.h" #include "network/servent.h"
#include "dllmacro.h" #include "../sipdllmacro.h"
class DLLEXPORT Node : public QObject class SIPDLLEXPORT Node : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -53,7 +53,7 @@ private:
}; };
class DLLEXPORT TomahawkZeroconf : public QObject class SIPDLLEXPORT TomahawkZeroconf : public QObject
{ {
Q_OBJECT Q_OBJECT

4
src/sip/zeroconf/zeroconf.h
View File

@@ -4,9 +4,9 @@
#include "sip/SipPlugin.h" #include "sip/SipPlugin.h"
#include "tomahawkzeroconf.h" #include "tomahawkzeroconf.h"
#include "dllmacro.h" #include "../sipdllmacro.h"
class DLLEXPORT ZeroconfPlugin : public SipPlugin class SIPDLLEXPORT ZeroconfPlugin : public SipPlugin
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES( SipPlugin ) Q_INTERFACES( SipPlugin )