Changeset 75:1b7a0f00f4a0 in verona

Timestamp:

Feb 15, 2010 6:53:47 PM (3 years ago)

Author:

vadim@…

Branch:

default

Message:

Rename MY_DLLEXPORT to PHAPI_EXPORT

Location:

phapi

Files:

• phapi.c (modified) (67 diffs)
• phapi.h (modified) (56 diffs)

phapi/phapi.c

@@ -266 +266 @@
 
 
-MY_DLLEXPORT phCallbacks_t *phcb;
-
-MY_DLLEXPORT int phIsInitialized;
-
-MY_DLLEXPORT int phDebugLevel = 0;
-MY_DLLEXPORT char *phLogFileName = 0;
+PHAPI_EXPORT phCallbacks_t *phcb;
+
+PHAPI_EXPORT int phIsInitialized;
+
+PHAPI_EXPORT int phDebugLevel = 0;
+PHAPI_EXPORT char *phLogFileName = 0;
 
 
@@ -279 +279 @@
 
 unsigned short phCallBackPort = PH_CALLBACK_PORT; 
-MY_DLLEXPORT  unsigned short phServerPort = PH_SERVER_PORT; 
+PHAPI_EXPORT  unsigned short phServerPort = PH_SERVER_PORT;
 
 static int ph_busyFlag;
@@ -402 +402 @@
 
 
-MY_DLLEXPORT ph_config_t *ph_get_config()
+PHAPI_EXPORT ph_config_t *ph_get_config()
 {
   return &phcfg;
@@ -906 +906 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phGetAudioVersion()
 {
@@ -932 +932 @@
 } 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phGetNatInfo(char *ntstr, int ntlen, char *fwip, int fwiplen)
 {
@@ -946 +946 @@
 
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phSetUaString(const char *uastr)
 {
@@ -954 +954 @@
 
 
-MY_DLLEXPORT
+PHAPI_EXPORT
 phAddCustomHeader(const char *reqnames, const char *hdrname,  const char *hdrval)
 {
@@ -1041 +1041 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLinePlaceCall2(int vlid, const char *uri, void *userdata, int rcid, int streams)
 {
@@ -1048 +1048 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLinePlaceCall3(int vlid, const char *uri, void *userdata, int rcid, int streams, const char *adev)
 {
@@ -1054 +1054 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLinePlaceCall4(int vlid, const char *uri, void *userdata, int rcid, int streams, const char *adev, const char *audio_addr, const char *video_addr)
 {
@@ -1062 +1062 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLinePlaceMcCall(int vlid, const char *uri, void *userdata, int streams, const char *adev)
 {
@@ -1229 +1229 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLinePlaceCall(int vlid, const char *uri, void *userdata, int rcid)
 {
@@ -1235 +1235 @@
 }
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phLineSendMessage(int vlid, const char *uri, const char *buff, const char *mime)
 {
@@ -1245 +1245 @@
 
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phLineSendMessage2(int vlid, const char *target, const char *uri, 
                    const char *buff, const char *mime, const char *sipcid)
@@ -1285 +1285 @@
 }
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phCallSendMessage(int cid, const char *buff, const char *mime)
 {
@@ -1310 +1310 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSendMessage(const char *from, const char *uri, 
                           const char *buff, const char *mime)
@@ -1329 +1329 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLineSubscribe(int vlid, const char *uri, const int winfo)
 {
@@ -1359 +1359 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLineUnsubscribe(int vlid, const char *uri, const int winfo)
 {
@@ -1392 +1392 @@
 
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phSubscribe(const char *from, const char *to, const int winfo)
 {
@@ -1412 +1412 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLinePublish(int vlid, const char *uri, int winfo, const char * content_type, const char * content)
 {
@@ -1420 +1420 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLinePublish2(int vlid, const char *uri, const char *evt, const char *ctt, const char *body, int expires)
 {
@@ -1465 +1465 @@
 } 
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phPublish(const char *from, const char *to, const int winfo, const char * content_type, const char * content)
 {
@@ -1485 +1485 @@
 }
 
-MY_DLLEXPORT void
+PHAPI_EXPORT void
 phRefresh()
 {
@@ -1496 +1496 @@
 
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phLineSendOptions(int vlid, const char *to)
 {
@@ -1532 +1532 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSendOptions(const char *from, const char *uri)
 {
@@ -1555 +1555 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phAcceptCall2(int cid, void *userData)
 {
@@ -1561 +1561 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phAcceptCall3(int cid, void *userData, int streams)
 {
@@ -1601 +1601 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phAcceptCall4(int cid, void *userData, int streams, const char *audio_addr, const char *video_addr)
 {
@@ -1708 +1708 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phAcceptMcCall(int cid, const char *adev, const char *audioaddr, int port)
 {
@@ -1771 +1771 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phAcceptMcCall2(int cid, int mcid)
 {
@@ -1849 +1849 @@
 
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phLineGetMobility(int vlid)
 {
@@ -2097 +2097 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phAcceptCall5(int cid, void *userData, int streams, ...)
 {
@@ -2127 +2127 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phRejectCall(int cid, int reason)
 {
@@ -2150 +2150 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phRejectCall2(int cid, const char *uri,int reason)
 {
@@ -2175 +2175 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phRingingCall(int cid)
 {
@@ -2192 +2192 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phCloseCall(int cid)
 {
@@ -2249 +2249 @@
 
 
-MY_DLLEXPORT int phCallStartMedia(int cid, int streamFlags)
+PHAPI_EXPORT int phCallStartMedia(int cid, int streamFlags)
 {
   int i;
@@ -2268 +2268 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phBlindTransferCall(int cid, const char *uri)
 {
@@ -2299 +2299 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phTransferCall(int cid, int tcid)
 {
@@ -2343 +2343 @@
 
 
-MY_DLLEXPORT  int 
+PHAPI_EXPORT  int
 phSetContact(int vlid, const char *uri)
 {
@@ -2349 +2349 @@
 }
 
-MY_DLLEXPORT  int 
+PHAPI_EXPORT  int
 phSetContact2(int vlid, const char *uri, int translate)
 {
@@ -2387 +2387 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phConf(int cid1, int cid2)
 {
@@ -2402 +2402 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phStopConf(int cid1, int cid2)
 {
@@ -2420 +2420 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phResumeCall(int cid)
 {
@@ -2462 +2462 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phHoldCall(int cid)
 {
@@ -2495 +2495 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSetFollowMe(const char *uri)
 {
@@ -2513 +2513 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSetBusy(int busyFlag)
 {
@@ -2521 +2521 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLineSetFollowMe(int vlid, const char *uri)
 {
@@ -2546 +2546 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phLineSetBusy(int vlid, int busyFlag)
 {
@@ -2564 +2564 @@
 
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phAddAuthInfo(const char *username, const char *userid,
                                const char *passwd, const char *ha1,
@@ -2656 +2656 @@
 
  
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSendDtmf(int cid, int dtmfEvent, int mode)
 {
@@ -2723 +2723 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phPlaySoundFile(const char *fileName , int loop)
 {
@@ -2731 +2731 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSendSoundFile(int cid, const char *fileName)
 {
@@ -2751 +2751 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phStopSoundFile()
 {
@@ -2758 +2758 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSetSpeakerVolume(int cid,  int volume)
 {
@@ -2774 +2774 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phSetRecLevel(int cid,  int level)
 {
@@ -2792 +2792 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phAddVline(const char* username, const char *server, const char*  proxy,  int regTimeout)
 {
@@ -2832 +2832 @@
 #define nonull(x) ((x) ? (x) : emptystr)
 
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phAddVline2(const char *displayname, const char* username, const char *server, const char*  proxy,  int regTimeout)
 {
   return phAddVline3(displayname, username, server, proxy, regTimeout, 0);
 }
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phAddVline3(const char *displayname, const char* username, const char *server, const char*  proxy,  int regTimeout, int mobility)
 
@@ -2954 +2954 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phDelVline(int vlid)
 {
@@ -3001 +3001 @@
 
 
-MY_DLLEXPORT int phChangeAudioDevices(const char *devstr)
+PHAPI_EXPORT int phChangeAudioDevices(const char *devstr)
 {
   if (devstr)
@@ -3859 +3859 @@
   
   
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phCallGetSipCallID(int cid, char* buf, int bufsize) 
 {
@@ -3889 +3889 @@
 
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phInit(phCallbacks_t *cbk, char * server, int asyncmode)
 {
@@ -4054 +4054 @@
  * terminate ph api
  */
-MY_DLLEXPORT void 
+PHAPI_EXPORT void
 phTerminate()
 {
@@ -4128 +4128 @@
  * poll for phApi events.c 
  */
-MY_DLLEXPORT int
+PHAPI_EXPORT int
 phPoll()
 {
@@ -4207 +4207 @@
 
 
-MY_DLLEXPORT int phCallGetCodecs(int cid, char *audioCodecBuf, int aBufLen, char *videoCodecBuf, int vBufLen)
+PHAPI_EXPORT int phCallGetCodecs(int cid, char *audioCodecBuf, int aBufLen, char *videoCodecBuf, int vBufLen)
 {
   phcall_t *ca = ph_locate_call_by_cid(cid);
@@ -4229 +4229 @@
 }
 
-MY_DLLEXPORT int 
+PHAPI_EXPORT int
 phCallGetMediaInfo(int cid, struct ph_confirmed_media_info *mi)
 {
@@ -6020 +6020 @@
 
 #ifdef QOS_DEBUG_ENABLE
-MY_DLLEXPORT void phrtcp_QoS_enable_rtcp_report(int ToF)
+PHAPI_EXPORT void phrtcp_QoS_enable_rtcp_report(int ToF)
 {
         ortcp_enable_rtcp_report(ToF);
 }
-MY_DLLEXPORT void phrtcp_report_set_cb(jt_rtcpCallbacks_t *cbk)
+PHAPI_EXPORT void phrtcp_report_set_cb(jt_rtcpCallbacks_t *cbk)
 {
         ortcp_report_set_cb(cbk);
 }
-MY_DLLEXPORT int phrtcp_report_begin()
+PHAPI_EXPORT int phrtcp_report_begin()
 {
         phrtcp_QoS_enable_rtcp_report(1);
         ortcp_report_begin();
 }
-MY_DLLEXPORT int phrtcp_report_end()
+PHAPI_EXPORT int phrtcp_report_end()
 {
         ortcp_report_end();

phapi/phapi.h

@@ -123 +123 @@
 #ifdef WIN32
 #if defined(BUILD_PHAPI_DLL)
-#define MY_DLLEXPORT __declspec(dllexport) 
+#define PHAPI_EXPORT __declspec(dllexport)
 #elif defined(PHAPI_DLL)
-#define MY_DLLEXPORT __declspec(dllimport) 
+#define PHAPI_EXPORT __declspec(dllimport)
 #endif
 #endif
 
-#ifndef MY_DLLEXPORT
-#define MY_DLLEXPORT 
+#ifndef PHAPI_EXPORT
+#define PHAPI_EXPORT
 #endif
 
@@ -191 +191 @@
  * @return             -1 in case of error vlid  in case of success
  */
-MY_DLLEXPORT int phAddVline(const char* username, const char *host, const char*  proxy,  int regTimeout);
-MY_DLLEXPORT int phAddVline2(const char* displayname, const char* username, const char *host, const char*  proxy, int regTimeout);
-MY_DLLEXPORT int phAddVline3(const char* displayname, const char* username, const char *host, const char*  proxy, int regTimeout, int mobility);
+PHAPI_EXPORT int phAddVline(const char* username, const char *host, const char*  proxy,  int regTimeout);
+PHAPI_EXPORT int phAddVline2(const char* displayname, const char* username, const char *host, const char*  proxy, int regTimeout);
+PHAPI_EXPORT int phAddVline3(const char* displayname, const char* username, const char *host, const char*  proxy, int regTimeout, int mobility);
  
 /**
@@ -202 +202 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phDelVline(int vlid);
+PHAPI_EXPORT int phDelVline(int vlid);
 
 
@@ -242 +242 @@
  * @return             if positive the call id else error indication
  */
-MY_DLLEXPORT int phLinePlaceCall(int vlid, const char *uri, void *userData, int rcid);
-MY_DLLEXPORT int phLinePlaceCall2(int vlid, const char *uri, void *userData, int rcid, int streams);
-MY_DLLEXPORT int phLinePlaceCall4(int vlid, const char *uri, void *userdata, int rcid, int streams, const char *adev, const char *audio_addr, const char *video_addr);
-MY_DLLEXPORT int phLinePlaceCall5(int vlid, const char *uri, void *userdata, int rcid, int streams, const char *adev, ...);
+PHAPI_EXPORT int phLinePlaceCall(int vlid, const char *uri, void *userData, int rcid);
+PHAPI_EXPORT int phLinePlaceCall2(int vlid, const char *uri, void *userData, int rcid, int streams);
+PHAPI_EXPORT int phLinePlaceCall4(int vlid, const char *uri, void *userdata, int rcid, int streams, const char *adev, const char *audio_addr, const char *video_addr);
+PHAPI_EXPORT int phLinePlaceCall5(int vlid, const char *uri, void *userdata, int rcid, int streams, const char *adev, ...);
 
 /**
@@ -253 +253 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phAcceptCall2(int cid, void *userData);
-MY_DLLEXPORT int phAcceptCall3(int cid, void *userData, int streams);
-MY_DLLEXPORT int phAcceptCall4(int cid, void *userData, int streams, const char *audio_addr, const char *video_addr);
-MY_DLLEXPORT int phAcceptCall5(int cid, void *userData, int streams, ...);
+PHAPI_EXPORT int phAcceptCall2(int cid, void *userData);
+PHAPI_EXPORT int phAcceptCall3(int cid, void *userData, int streams);
+PHAPI_EXPORT int phAcceptCall4(int cid, void *userData, int streams, const char *audio_addr, const char *video_addr);
+PHAPI_EXPORT int phAcceptCall5(int cid, void *userData, int streams, ...);
 
 /*
@@ -266 +266 @@
  * @param port       port number for the audio stream
  */
-MY_DLLEXPORT int phAcceptMcCall(int cid, const char *adev, const char *audioaddr, int port);
+PHAPI_EXPORT int phAcceptMcCall(int cid, const char *adev, const char *audioaddr, int port);
 
 
@@ -276 +276 @@
  * @param port       port number for the audio stream
  */
-MY_DLLEXPORT int phAcceptMcCall2(int cid, int mcid);
+PHAPI_EXPORT int phAcceptMcCall2(int cid, int mcid);
 
 
@@ -289 +289 @@
  * @param adev         audio device for call
  */
-MY_DLLEXPORT int phLinePlaceMcCall(int vlid, const char *uri, void *userdata, int streams, const char *adev);
+PHAPI_EXPORT int phLinePlaceMcCall(int vlid, const char *uri, void *userdata, int streams, const char *adev);
 
 
@@ -304 +304 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phRejectCall(int cid, int reason);
-MY_DLLEXPORT int phRejectCall2(int cid, const char *uri,int reason);
+PHAPI_EXPORT int phRejectCall(int cid, int reason);
+PHAPI_EXPORT int phRejectCall2(int cid, const char *uri,int reason);
 
 
@@ -314 +314 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phRingingCall(int cid);
+PHAPI_EXPORT int phRingingCall(int cid);
 
 /**
@@ -322 +322 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phCloseCall(int cid);
+PHAPI_EXPORT int phCloseCall(int cid);
 
 /**
@@ -331 +331 @@
  * @return             txid  used in the subsequent transferProgress callback
  */
-MY_DLLEXPORT int phBlindTransferCall(int cid, const char *uri);
+PHAPI_EXPORT int phBlindTransferCall(int cid, const char *uri);
 
 /**
@@ -340 +340 @@
  * @return             txid  used in the subsequent transferProgress callback
  */
-MY_DLLEXPORT int phTransferCall(int cid, int targetCid);
+PHAPI_EXPORT int phTransferCall(int cid, int targetCid);
 
 /**
@@ -348 +348 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phResumeCall(int cid);
+PHAPI_EXPORT int phResumeCall(int cid);
 
 /**
@@ -356 +356 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phHoldCall(int cid);
-
-
-
-MY_DLLEXPORT int phCallStartMedia(int cid, int streamFlags);
-MY_DLLEXPORT int phCallGetMediaInfo(int cid, struct ph_confirmed_media_info *mi);
+PHAPI_EXPORT int phHoldCall(int cid);
+
+
+
+PHAPI_EXPORT int phCallStartMedia(int cid, int streamFlags);
+PHAPI_EXPORT int phCallGetMediaInfo(int cid, struct ph_confirmed_media_info *mi);
 
 /**
@@ -370 +370 @@
  * @param  bufsize size of te idbuf
  */
-MY_DLLEXPORT int phCallGetSipCallID(int cid, char *idbuf,  int bufsize);
+PHAPI_EXPORT int phCallGetSipCallID(int cid, char *idbuf,  int bufsize);
 
 
@@ -386 +386 @@
 
 
-MY_DLLEXPORT int phLineSetFollowMe(int vlid, const char *uri);
+PHAPI_EXPORT int phLineSetFollowMe(int vlid, const char *uri);
 
 /**
@@ -395 +395 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phLineSetBusy(int vlid, int busyFlag);
+PHAPI_EXPORT int phLineSetBusy(int vlid, int busyFlag);
 
 
@@ -415 +415 @@
  * @return  if positive msgid
 */
-MY_DLLEXPORT int phLineSendMessage(int vlid, const char *uri, 
+PHAPI_EXPORT int phLineSendMessage(int vlid, const char *uri,
                                    const char *buff, const char *mime);
-MY_DLLEXPORT int phLineSendMessage2(int vlid, const char *target, const char *uri, 
+PHAPI_EXPORT int phLineSendMessage2(int vlid, const char *target, const char *uri,
                                    const char *buff, const char *mime, 
                                     const char *sipcid);
-MY_DLLEXPORT int phCallSendMessage(int cid, const char *buff, const char *mime);
+PHAPI_EXPORT int phCallSendMessage(int cid, const char *buff, const char *mime);
 
 
@@ -443 +443 @@
  * @return 0 if success else -1
 */
-MY_DLLEXPORT int phLineSubscribe(int vlid, const char *to, const int winfo);
+PHAPI_EXPORT int phLineSubscribe(int vlid, const char *to, const int winfo);
 
 /**
@@ -453 +453 @@
  * @return 0 if success else -1
 */
-MY_DLLEXPORT int phLineUnsubscribe(int vlid, const char *to, const int winfo);
+PHAPI_EXPORT int phLineUnsubscribe(int vlid, const char *to, const int winfo);
 
 /**
@@ -467 +467 @@
  * @return 0 if success else -1
 */
-MY_DLLEXPORT int phLinePublish(int vlid, const char *to, const int winfo, const char * content_type, const char * content);
-MY_DLLEXPORT int phLinePublish2(int vlid, const char *to, const char *evt, const char * content_type, const char * content,
+PHAPI_EXPORT int phLinePublish(int vlid, const char *to, const int winfo, const char * content_type, const char * content);
+PHAPI_EXPORT int phLinePublish2(int vlid, const char *to, const char *evt, const char * content_type, const char * content,
                                 int expires);
 
@@ -493 +493 @@
 #define PH_DTMF_MODE_SIP 4       
 #define PH_DTMF_MODE_SIPRELAY 8  
-MY_DLLEXPORT int phSendDtmf(int cid, int dtmfChar, int mode);
+PHAPI_EXPORT int phSendDtmf(int cid, int dtmfChar, int mode);
 
 /**
@@ -503 +503 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phPlaySoundFile(const char *fileName , int loop);
+PHAPI_EXPORT int phPlaySoundFile(const char *fileName , int loop);
 
 /**
@@ -510 +510 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phStopSoundFile( void );
+PHAPI_EXPORT int phStopSoundFile( void );
 
 /**
@@ -520 +520 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phSendSoundFile(int cid, const char *fileName);
+PHAPI_EXPORT int phSendSoundFile(int cid, const char *fileName);
 
 /**
@@ -529 +529 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phSetSpeakerVolume(int cid,  int volume);
+PHAPI_EXPORT int phSetSpeakerVolume(int cid,  int volume);
 
 /**
@@ -538 +538 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phSetRecLevel(int cid,  int level);
+PHAPI_EXPORT int phSetRecLevel(int cid,  int level);
 
 /**
@@ -549 +549 @@
  * 
  */
-MY_DLLEXPORT int phChangeAudioDevices(const char *devstr);
+PHAPI_EXPORT int phChangeAudioDevices(const char *devstr);
 
 
@@ -559 +559 @@
  * @return      0 if succeeds, an error value otherwise
  */
-MY_DLLEXPORT int  phSetUaString(const char *uastr);
+PHAPI_EXPORT int  phSetUaString(const char *uastr);
 
 
@@ -569 +569 @@
   * @return     0 if succeeds, an error value otherwise
   */  
-MY_DLLEXPORT int phAddCustomHeader(const char *reqnames, const char *hdrname,  const char *hdrval);
+PHAPI_EXPORT int phAddCustomHeader(const char *reqnames, const char *hdrname,  const char *hdrval);
 
 
@@ -594 +594 @@
  *
  */
-MY_DLLEXPORT int phConfCreate(int cid);
+PHAPI_EXPORT int phConfCreate(int cid);
 
 /**
@@ -604 +604 @@
  *
  */
-MY_DLLEXPORT int phLineConfInvite(int vlid, int cfid, const char *uri);
+PHAPI_EXPORT int phLineConfInvite(int vlid, int cfid, const char *uri);
 
 /**
@@ -615 +615 @@
  *
  */
-MY_DLLEXPORT int phConfAddMember(int cfid, int callid);
+PHAPI_EXPORT int phConfAddMember(int cfid, int callid);
 
 /**
@@ -628 +628 @@
  *
  */
-MY_DLLEXPORT int phConfRemoveMember(int cfid, int cid);
+PHAPI_EXPORT int phConfRemoveMember(int cfid, int cid);
 
 /**
@@ -639 +639 @@
  *
  */
-MY_DLLEXPORT int phConfClose(int cfid);
+PHAPI_EXPORT int phConfClose(int cfid);
 
 
@@ -652 +652 @@
  *
  */ 
-MY_DLLEXPORT int phConf(int cid1, int cid2);
+PHAPI_EXPORT int phConf(int cid1, int cid2);
 
 /**
@@ -662 +662 @@
  *
  */ 
-MY_DLLEXPORT int phStopConf(int cid1, int cid2);
+PHAPI_EXPORT int phStopConf(int cid1, int cid2);
 
 
@@ -678 +678 @@
  *
  */ 
-MY_DLLEXPORT  int phSetContact(int vlid, const char *uri);
-MY_DLLEXPORT  int phSetContact2(int vlid, const char *uri, int translate);
+PHAPI_EXPORT  int phSetContact(int vlid, const char *uri);
+PHAPI_EXPORT  int phSetContact2(int vlid, const char *uri, int translate);
 
 
@@ -690 +690 @@
  * @return --  0 in case of success
 */
-MY_DLLEXPORT int phLineGetSipAddress(int vlid, char buf[], int bufsize);
+PHAPI_EXPORT int phLineGetSipAddress(int vlid, char buf[], int bufsize);
 
 /**
@@ -699 +699 @@
  * @param to    --  uri to put in the To: header
 */
-MY_DLLEXPORT int phLineSendOptions(int vlid, const char *to);
+PHAPI_EXPORT int phLineSendOptions(int vlid, const char *to);
 
 /**
@@ -711 +711 @@
  *
  */
-MY_DLLEXPORT int phGetNatInfo(char *natType, int ntlen, char *fwip, int fwiplen);
+PHAPI_EXPORT int phGetNatInfo(char *natType, int ntlen, char *fwip, int fwiplen);
 
 enum ph_line_mobility
@@ -729 +729 @@
  *
  */
-MY_DLLEXPORT int phLineGetMobility(int vlid);
+PHAPI_EXPORT int phLineGetMobility(int vlid);
 
 
@@ -744 +744 @@
  */
 
-MY_DLLEXPORT int phCallGetCodecs(int cid, char *audioCodecBuf, int aBufLen, char *videoCodecBuf, int vBufLen); 
+PHAPI_EXPORT int phCallGetCodecs(int cid, char *audioCodecBuf, int aBufLen, char *videoCodecBuf, int vBufLen);
 
 
@@ -751 +751 @@
  * @brief Try to crash the application 
 */
-MY_DLLEXPORT int phCrash();
+PHAPI_EXPORT int phCrash();
 
 
@@ -934 +934 @@
  * 
  */
-MY_DLLEXPORT extern phCallbacks_t *phcb;
+PHAPI_EXPORT extern phCallbacks_t *phcb;
 
 /**
@@ -949 +949 @@
  *                     in client/server mode this parameter has client local meaning.
  */
-MY_DLLEXPORT int phInit(phCallbacks_t *cbk, char *server, int asyncmode);
+PHAPI_EXPORT int phInit(phCallbacks_t *cbk, char *server, int asyncmode);
 
 /**
  *  Terminate phApi
  */
-MY_DLLEXPORT void phTerminate( void );
+PHAPI_EXPORT void phTerminate( void );
 
 /**
@@ -968 +968 @@
  * @return             0 in case of success
  */
-MY_DLLEXPORT int phAddAuthInfo(const char *username, const char *userid,
+PHAPI_EXPORT int phAddAuthInfo(const char *username, const char *userid,
               const char *passwd, const char *ha1,
               const char *realm);
@@ -986 +986 @@
  *                                                                      setup a tunnel with given parameters.
 */
-MY_DLLEXPORT int phTunnelConfig(const char* http_proxy, const int http_proxy_port,
+PHAPI_EXPORT int phTunnelConfig(const char* http_proxy, const int http_proxy_port,
                                                                 const char* httpt_server, const int httpt_server_port, 
                                                                 const char *proxy_user, const char* proxy_passwd,
@@ -996 +996 @@
                  0 : Otherwise
 */
-MY_DLLEXPORT extern int phIsInitialized;
+PHAPI_EXPORT extern int phIsInitialized;
 
 /**
@@ -1004 +1004 @@
  *
  */
-MY_DLLEXPORT int phGetVersion(void);
+PHAPI_EXPORT int phGetVersion(void);
 
 /**
  * poll for phApi events
  */
-MY_DLLEXPORT int phPoll( void );
+PHAPI_EXPORT int phPoll( void );
 
 
@@ -1015 +1015 @@
  * Set debugging level (between 0 and 9)
  */
-MY_DLLEXPORT void phSetDebugLevel(int);
-MY_DLLEXPORT int  phGetDebugLevel();
+PHAPI_EXPORT void phSetDebugLevel(int);
+PHAPI_EXPORT int  phGetDebugLevel();
 
 
@@ -1022 +1022 @@
  * Define log file name
  */
-MY_DLLEXPORT void phSetLogFileName(const char *name);
+PHAPI_EXPORT void phSetLogFileName(const char *name);
 
 
@@ -1028 +1028 @@
  * Internal function. Do a register for all virtual lines
  */
-MY_DLLEXPORT void phRefresh(void);
+PHAPI_EXPORT void phRefresh(void);
 
 /**
  * In the case of rpc mode, the phapi server port
  */
-MY_DLLEXPORT extern unsigned short phServerPort;
+PHAPI_EXPORT extern unsigned short phServerPort;
 
 
@@ -1047 +1047 @@
 /********************VIDEO*********************/
 
-MY_DLLEXPORT int  phVideoControlChangeFps(int callid, int fps);
-MY_DLLEXPORT int  phVideoControlChangeQuality(int callid, int quality);
-MY_DLLEXPORT int  phVideoControlSetCameraFlip(int flip);
-MY_DLLEXPORT int  phVideoControlSetWebcamCaptureResolution(int width, int height);
-MY_DLLEXPORT int  phVideoControlSetBitrate(int callid, int maxrate, int minrate);
-MY_DLLEXPORT void phVideoControlCodecSet(int, struct ph_videocodecconfig_s *);
-MY_DLLEXPORT void phVideoControlCodecGet(int, struct ph_videocodecconfig_s *);
+PHAPI_EXPORT int  phVideoControlChangeFps(int callid, int fps);
+PHAPI_EXPORT int  phVideoControlChangeQuality(int callid, int quality);
+PHAPI_EXPORT int  phVideoControlSetCameraFlip(int flip);
+PHAPI_EXPORT int  phVideoControlSetWebcamCaptureResolution(int width, int height);
+PHAPI_EXPORT int  phVideoControlSetBitrate(int callid, int maxrate, int minrate);
+PHAPI_EXPORT void phVideoControlCodecSet(int, struct ph_videocodecconfig_s *);
+PHAPI_EXPORT void phVideoControlCodecGet(int, struct ph_videocodecconfig_s *);
 
 
@@ -1135 +1135 @@
  */
 
-MY_DLLEXPORT ph_config_t *ph_get_config();
+PHAPI_EXPORT ph_config_t *ph_get_config();
 
 
 /* JT */
 #ifdef QOS_DEBUG_ENABLE
-MY_DLLEXPORT void phrtcp_QoS_enable_rtcp_report(int ToF);
-MY_DLLEXPORT void phrtcp_report_set_cb(jt_rtcpCallbacks_t *cbk);
-MY_DLLEXPORT int phrtcp_report_begin();
-MY_DLLEXPORT int phrtcp_report_end();
+PHAPI_EXPORT void phrtcp_QoS_enable_rtcp_report(int ToF);
+PHAPI_EXPORT void phrtcp_report_set_cb(jt_rtcpCallbacks_t *cbk);
+PHAPI_EXPORT int phrtcp_report_begin();
+PHAPI_EXPORT int phrtcp_report_end();
 #endif /* QOS_DEBUG_ENABLE */