kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix sun studio compile issues 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@967 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-03-30 01:35:26 +00:00
parent d92ee88a8b
commit 0232f398c7
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/iax/src/iax.c
View File

@ -286,7 +286,11 @@ void iax_disable_debug(void)
#ifdef WIN32 #ifdef WIN32
#define G __FILE__, __LINE__, #define G __FILE__, __LINE__,
#else #else
#ifdef __GNUC__
#define G __FILE__, __LINE__, __PRETTY_FUNCTION__, #define G __FILE__, __LINE__, __PRETTY_FUNCTION__,
#else
#define G __FILE__, __LINE__, __func__,
#endif
#endif #endif
#define DEBU __debug #define DEBU __debug

15
libs/iax/src/iax2.h
View File

@ -154,11 +154,16 @@ typedef long long time_in_ms_t;
#define IAX_DPSTATUS_IGNOREPAT (1 << 14) #define IAX_DPSTATUS_IGNOREPAT (1 << 14)
#define IAX_DPSTATUS_MATCHMORE (1 << 15) #define IAX_DPSTATUS_MATCHMORE (1 << 15)
#if defined(_MSC_VER) #if defined __GNUC__
#define __PACKED __attribute__ ((__packed__))
#else
#if defined (_MSC_VER)
#pragma pack(push,1) #pragma pack(push,1)
#define __PACKED #define __PACKED
#else #else
#define __PACKED __attribute__ ((__packed__)) #pragma pack(1)
#define __PACKED
#endif
#endif #endif
/* Full frames are always delivered reliably */ /* Full frames are always delivered reliably */
@ -218,8 +223,12 @@ struct ast_iax2_firmware_header {
} __PACKED; } __PACKED;
#if defined(_MSC_VER) #ifdef _MSC_VER
#pragma pack(pop) #pragma pack(pop)
#else
#ifndef __GNUC__
#pragma pack()
#endif
#endif #endif
#undef __PACKED #undef __PACKED