generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing replicated #defines and using a single source for them, UpnpGlobal.h.

Browse Source 
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@423 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2008-06-06 22:28:46 +00:00
parent aa63ef88f1
commit 9ca32e0eb4
3 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ixml/inc/ixml.h
View File

@ -43,32 +43,9 @@
*/ */
#ifdef WIN32 #include "UpnpGlobal.h" /* For EXPORT_SPEC */
#ifndef UPNP_STATIC_LIB
#ifdef LIBUPNP_EXPORTS
/* set up declspec for dll export to make functions visible to library users */
#define EXPORT_SPEC __declspec(dllexport)
#else /* LIBUPNP_EXPORTS */
#define EXPORT_SPEC __declspec(dllimport)
#endif /* LIBUPNP_EXPORTS */
#else /* UPNP_STATIC_LIB */
#define EXPORT_SPEC
#endif /* UPNP_STATIC_LIB */
#ifdef UPNP_USE_MSVCPP
/* define some things the M$ VC++ doesn't know */
#define IXML_INLINE
#endif /* UPNP_USE_MSVCPP */
#ifdef UPNP_USE_BCBPP
/* define some things Borland Builder doesn't know */
#define IXML_INLINE inline
#endif /* UPNP_USE_BCBPP */
#else /* WIN32 */
#define EXPORT_SPEC
#define IXML_INLINE inline
#endif /* WIN32 */
typedef int BOOL; typedef int BOOL;

2
ixml/inc/ixmldebug.h
View File

@ -29,7 +29,7 @@ void IxmlPrintf(
#endif #endif
; ;
#else /* DEBUG */ #else /* DEBUG */
static IXML_INLINE void IxmlPrintf( static UPNP_INLINE void IxmlPrintf(
const char* FmtStr, const char* FmtStr,
...) {} ...) {}
#endif /* DEBUG */ #endif /* DEBUG */

22
threadutil/inc/ithread.h
View File

@ -29,8 +29,14 @@
* *
******************************************************************************/ ******************************************************************************/
#ifndef ITHREADH #ifndef ITHREADH
#define ITHREADH #define ITHREADH
#include "UpnpGlobal.h" /* For EXPORT_SPEC */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -745,22 +751,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
#endif #endif
#ifdef WIN32
#ifndef UPNP_STATIC_LIB
#ifdef LIBUPNP_EXPORTS
/* set up declspec for dll export to make functions visible to library users */
#define EXPORT_SPEC __declspec(dllexport)
#else
#define EXPORT_SPEC __declspec(dllimport)
#endif
#else
#define EXPORT_SPEC
#endif
#else
#define EXPORT_SPEC
#endif
#ifndef PTHREAD_MUTEX_RECURSIVE #ifndef PTHREAD_MUTEX_RECURSIVE
/* NK: Added for satisfying the gcc compiler */ /* NK: Added for satisfying the gcc compiler */
EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind); EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);