Changeset 9282

Timestamp:

Oct 11, 2009, 1:32:58 AM (13 years ago)

Author:

livings124

Message:

update to miniupnpc-20091010

Location:

trunk/third-party/miniupnp

Files:

• Changelog.txt (modified) (1 diff)
• miniupnpc.c (modified) (4 diffs)
• miniupnpc.h (modified) (2 diffs)
• miniwget.c (modified) (3 diffs)
• minixml.c (modified) (2 diffs)

trunk/third-party/miniupnp/Changelog.txt

@@ -1 @@
-$Id: Changelog.txt,v 1.91 2009/09/21 12:57:42 nanard Exp $
+$Id: Changelog.txt,v 1.93 2009/10/10 19:15:34 nanard Exp $
 miniUPnP client Changelog.
+
+2009/10/10:
+  Some fixes for compilation under Solaris
+  compilation fixes : http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1464
 
 2009/09/21:

trunk/third-party/miniupnp/miniupnpc.c

@@ -1 @@
-/* $Id: miniupnpc.c,v 1.64 2009/09/21 12:57:42 nanard Exp $ */
+/* $Id: miniupnpc.c,v 1.66 2009/10/10 19:15:34 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas BERNARD
@@ -6 +6 @@
  * provided LICENCE file. */
 #define __EXTENSIONS__ 1
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(__sun)
 #if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__)
 #ifndef __cplusplus
@@ -35 +35 @@
 /* Standard POSIX includes */
 #include <unistd.h>
-#include <sys/select.h> /* fd_set */
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -699 +699 @@
 }
 
-static int
+int
 UPNPIGD_IsConnected(struct UPNPUrls * urls, struct IGDdatas * data)
 {

trunk/third-party/miniupnp/miniupnpc.h

@@ -1 @@
-/* $Id: miniupnpc.h,v 1.18 2008/09/25 18:02:50 nanard Exp $ */
+/* $Id: miniupnpc.h,v 1.19 2009/10/10 19:15:35 nanard Exp $ */
 /* Project: miniupnp
  * http://miniupnp.free.fr/
@@ -103 +103 @@
 int ReceiveData(int socket, char * data, int length, int timeout);
 
+/* return 0 or 1 */
+LIBSPEC int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
+
+
 #ifdef __cplusplus
 }

trunk/third-party/miniupnp/miniwget.c

@@ -1 @@
-/* $Id: miniwget.c,v 1.26 2009/09/21 12:57:42 nanard Exp $ */
+/* $Id: miniwget.c,v 1.28 2009/10/10 19:15:35 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
@@ -21 +21 @@
 #include <unistd.h>
 #include <sys/param.h>
-#include <sys/select.h> /* fd_set */
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -27 +27 @@
 #include <arpa/inet.h>
 #include <errno.h>
+#include <time.h>
 #define closesocket close
 #define MINIUPNPC_IGNORE_EINTR

trunk/third-party/miniupnp/minixml.c

@@ -1 @@
-/* $Id: minixml.c,v 1.6 2007/05/15 18:14:08 nanard Exp $ */
+/* $Id: minixml.c,v 1.7 2009/10/10 19:15:35 nanard Exp $ */
 /* minixml.c : the minimum size a xml parser can be ! */
 /* Project : miniupnp
@@ -5 +5 @@
  * Author : Thomas Bernard
 
-Copyright (c) 2005-2007, Thomas BERNARD 
+Copyright (c) 2005-2009, Thomas BERNARD 
 All rights reserved.