Changeset 699 for pjproject/trunk/pjlib/include/pj/compat/socket.h

Timestamp:

Sep 10, 2006 4:33:48 PM (18 years ago)

Author:

bennylp

Message:

Fixed autoconf in mingw

File:

• pjproject/trunk/pjlib/include/pj/compat/socket.h (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/compat/socket.h

@@ -25 +25 @@
  */
 
+#if defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H != 0
+#  include <winsock2.h>
+#endif
+
 #if defined(PJ_HAS_WINSOCK_H) && PJ_HAS_WINSOCK_H != 0
 #  include <winsock.h>
-#endif
-
-#if defined(PJ_HAS_WINSOCK2_H) && PJ_HAS_WINSOCK2_H != 0
-#  include <winsock2.h>
 #endif
 
@@ -125 +125 @@
 
 /*
- * Windows specific
+ * This will finally be obsoleted, since it should be declared in
+ * os_auto.h
  */
-#if defined(PJ_WIN32) || defined(PJ_WIN32_WINCE)
+#if !defined(PJ_HAS_SOCKLEN_T) || PJ_HAS_SOCKLEN_T==0
     typedef int socklen_t;
 #endif