Changeset 37:4fe9562edc7c in verona

Timestamp:

Jan 5, 2010 3:09:03 PM (3 years ago)

Author:

nikita <>

Branch:

default

Parents:

36:12957c39df3b (diff), 23:1eeb186888a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

include debug

Files:

• libosip2/src/osipparser2/osip_port.c (modified) (4 diffs)
• libosip2/src/osipparser2/osip_port.c (modified) (1 diff)
• phapi/phcall.c (deleted)
• phapi/phconfig.c (deleted)

libosip2/src/osipparser2/osip_port.c

@@ -22 +22 @@
 #include <windows.h>
 #endif
+
 
 
@@ -871 +872 @@
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(_WIN32_WCE)
 
 #include <time.h>
+//#ifndef _WIN32_WCE
 #include <sys/timeb.h>
-
+//#endif /* !_WIN32_WCE */
 int
 __osip_port_gettimeofday (struct timeval *tp, void *tz)
@@ -886 +888 @@
         return OSIP_SUCCESS;
 }
-#elif defined(__linux)
-#include <sys/time.h>
+#elif defined(__linux) || defined(_WIN32_WCE)
+//#include <sys/time.h>
 #define __osip_port_gettimeofday gettimeofday
 #endif
@@ -898 +900 @@
   int relative_time=0;
   
-#if defined(WIN32) || defined(__linux)
+#if (defined(WIN32) || defined(__linux)) && !defined(_WIN32_WCE) 
   static struct timeval start={0,0};
   struct timeval now;

libosip2/src/osipparser2/osip_port.c

@@ -22 +22 @@
 #include <windows.h>
 #endif
+