Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fixed Duplicate Symbols for Linux #89

Merged
merged 1 commit into from Mar 11, 2012
Jump to file or symbol
Failed to load files and symbols.
+30 −30
Split
View
@@ -434,8 +434,8 @@ elif sys.platform=='linux2':
'plds4',
'plc4',
'ssl',
+ 'z',
'pthread',
- 'z',
'idn',
'dl',
'rt',
@@ -561,7 +561,7 @@
# PLAT
'./src/sipcc/plat/common/dns_utils.c',
- './src/sipcc/plat/unix-common/random.c',
+ #'./src/sipcc/plat/unix-common/random.c',
'./src/sipcc/plat/linux/plat_api_stub.c',
# CPR
@@ -57,7 +57,7 @@
* Initialize the platform threa.
* @todo add more explanation here.
*/
-int platThreadInit(char * tname)
+int sipcc_platThreadInit(char * tname)
{
return 0;
}
@@ -70,7 +70,7 @@ int platThreadInit(char * tname)
* @return 0 - SUCCESS
* -1 - FAILURE
*/
-int platInit()
+int sipcc_platInit()
{
return 0;
}
@@ -83,15 +83,15 @@ int platInit()
* @return 0 - SUCCESS
* -1 - FAILURE
*/
-void debugInit()
+void sipcc_debugInit()
{
return ;
}
/**
* Add cc control classifier
*/
-void platAddCallControlClassifiers(unsigned long myIPAddr, unsigned short myPort,
+void sipcc_platAddCallControlClassifiers(unsigned long myIPAddr, unsigned short myPort,
unsigned long cucm1IPAddr, unsigned short cucm1Port,
unsigned long cucm2IPAddr, unsigned short cucm2Port,
unsigned long cucm3IPAddr, unsigned short cucm3Port,
@@ -103,15 +103,15 @@ void platAddCallControlClassifiers(unsigned long myIPAddr, unsigned short myPort
/**
* Remove cc control classifier.
*/
-void platRemoveCallControlClassifiers()
+void sipcc_platRemoveCallControlClassifiers()
{
return;
}
/**
* Tell whether wifi is supported and active
*/
-cc_boolean platWlanISActive()
+cc_boolean sipcc_platWlanISActive()
{
return FALSE;
}
@@ -121,7 +121,7 @@ cc_boolean platWlanISActive()
* @return FAILURE or true length. "-1" means no active load found.
*
*/
-int platGetActiveInactivePhoneLoadName(char * image_a, char * image_b, int len)
+int sipcc_platGetActiveInactivePhoneLoadName(char * image_a, char * image_b, int len)
{
// initialize strings
memset(image_a, 0, len);
@@ -137,7 +137,7 @@ int platGetActiveInactivePhoneLoadName(char * image_a, char * image_b, int len)
* @param len the input length to cap the maximum value
* @return SUCCESS or FAILURE
*/
-int platGetPhraseText(int index, char* phrase, unsigned int len)
+int sipcc_platGetPhraseText(int index, char* phrase, unsigned int len)
{
return 0;
}
@@ -147,7 +147,7 @@ int platGetPhraseText(int index, char* phrase, unsigned int len)
* @param reason see the unregister reason definitions.
* @return void
*/
-void platSetUnregReason(int reason)
+void sipcc_platSetUnregReason(int reason)
{
return;
}
@@ -157,7 +157,7 @@ void platSetUnregReason(int reason)
* Get the unregistration reason code.
* @return reason code for unregistration, see the definition.
*/
-int platGetUnregReason()
+int sipcc_platGetUnregReason()
{
return 0;
}
@@ -167,7 +167,7 @@ int platGetUnregReason()
* @param kpml_config the kpml value
* @return void
*/
-void platSetKPMLConfig(cc_kpml_config_t kpml_config)
+void sipcc_platSetKPMLConfig(cc_kpml_config_t kpml_config)
{
return ;
}
@@ -194,7 +194,7 @@ void platSetKPMLConfig(cc_kpml_config_t kpml_config)
* @note This API maps to the following HandyIron API:
* int secIsServerSecure(SecServerType type) where type should be SRVR_TYPE_CCM
*/
-plat_soc_status_e platSecIsServerSecure(void)
+plat_soc_status_e sipcc_platSecIsServerSecure(void)
{
return PLAT_SOCK_NONSECURE;
}
@@ -241,7 +241,7 @@ plat_soc_status_e platSecIsServerSecure(void)
*
*/
cpr_socket_t
-platSecSocConnect (char *host,
+sipcc_platSecSocConnect (char *host,
int port,
int ipMode,
boolean mode,
@@ -268,7 +268,7 @@ platSecSocConnect (char *host,
* int secIsConnectionReady (int connDesc)
* The "sock" is the connection descriptor.
*/
-plat_soc_connect_status_e platSecSockIsConnected (cpr_socket_t sock)
+plat_soc_connect_status_e sipcc_platSecSockIsConnected (cpr_socket_t sock)
{
return PLAT_SOCK_CONN_OK;
}
@@ -306,14 +306,14 @@ plat_soc_connect_status_e platSecSockIsConnected (cpr_socket_t sock)
* @li [CPR_EMSGSIZE] The message is too large to be sent all at once
* @li [CPR_EDESTADDRREQ] The socket has no peer address set
*
+*/
ssize_t
platSecSocSend (cpr_socket_t soc,
CONST void *buf,
size_t len)
{
return 0;
}
- */
/**
* platSecSocRecv
@@ -342,14 +342,14 @@ platSecSocSend (cpr_socket_t soc,
* @li [CPR_ENOTCONN] A receive attempt is made on a connection-mode socket that is not connected
* @li [CPR_ENOTSUPP] The specified flags are not supported for this type of socket or protocol
*
+*/
ssize_t
platSecSocRecv (cpr_socket_t soc,
void * RESTRICT buf,
size_t len)
{
return 0;
}
- */
/**
* platSecSocClose
@@ -365,12 +365,12 @@ platSecSocRecv (cpr_socket_t soc,
*
* @note The possible error values this function should return are
* @li [CPR_EBADF] socket is not a valid socket descriptor.
+*/
cpr_status_e
platSecSocClose (cpr_socket_t soc)
{
return CPR_SUCCESS;
}
- */
#define MAX_LEN_SIS_VER 64
static cc_uint32_t major=1, minor=0, addtnl =0;
@@ -387,7 +387,7 @@ static char sis_ver_name[MAX_LEN_SIS_VER] = {0};
* @note the platform should store this information and provide it when asked via the platGetSISProtocolVer()
*/
-void platSetSISProtocolVer(cc_uint32_t a, cc_uint32_t b, cc_uint32_t c, char* name)
+void sipcc_platSetSISProtocolVer(cc_uint32_t a, cc_uint32_t b, cc_uint32_t c, char* name)
{
major = a;
minor = b;
@@ -409,7 +409,7 @@ void platSetSISProtocolVer(cc_uint32_t a, cc_uint32_t b, cc_uint32_t c, char* na
* @return void
*/
void
-platGetSISProtocolVer (cc_uint32_t *a, cc_uint32_t *b, cc_uint32_t *c, char* name)
+sipcc_platGetSISProtocolVer (cc_uint32_t *a, cc_uint32_t *b, cc_uint32_t *c, char* name)
{
if ( a ) {
*a = major;
@@ -428,17 +428,17 @@ platGetSISProtocolVer (cc_uint32_t *a, cc_uint32_t *b, cc_uint32_t *c, char* nam
}
}
-void debug_bind_keyword(const char *cmd, int32_t *flag_ptr)
+void sipcc_debug_bind_keyword(const char *cmd, int32_t *flag_ptr)
{
return;
}
-void platSetSpeakerMode(cc_boolean state)
+void sipcc_platSetSpeakerMode(cc_boolean state)
{
return;
}
-boolean platGetSpeakerHeadsetMode()
+boolean sipcc_platGetSpeakerHeadsetMode()
{
return TRUE;
}
@@ -453,18 +453,18 @@ boolean platGetSpeakerHeadsetMode()
* @return 1 - allowed, 0 - not allowed
*
*/
-int platGetFeatureAllowed(cc_sis_feature_id_e featureId)
+int sipcc_platGetFeatureAllowed(cc_sis_feature_id_e featureId)
{
return TRUE;
}
-int platGetAudioDeviceStatus(plat_audio_device_t device_type)
+int sipcc_platGetAudioDeviceStatus(plat_audio_device_t device_type)
{
return 0;
}
-void platGetMacAddr (char *maddr)
+void sipcc_platGetMacAddr (char *maddr)
{
maddr[0] = 0x44;
maddr[1] = 0x22;
@@ -478,7 +478,7 @@ void platGetMacAddr (char *maddr)
* Get the local IP address
*
*/
-char * platGetIPAddr ()
+char * sipcc_platGetIPAddr ()
{
int fd;
struct ifreq ifr;
@@ -503,7 +503,7 @@ char * platGetIPAddr ()
* @param void
* @return void
*/
-void platSetCucmRegTime (void) {
+void sipcc_platSetCucmRegTime (void) {
//Noop
}
@@ -513,7 +513,7 @@ void platSetCucmRegTime (void) {
* @param void
* @return u_long
*/
-cc_ulong_t platGetDefaultgw(){
+cc_ulong_t sipcc_platGetDefaultgw(){
return 0;
}