From fb62a5d42a2564f58d5f77f9e670b8b9f98b524a Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Mon, 4 Oct 2010 10:51:30 -0300 Subject: [PATCH] Update files for windows compilation. --- build/inc/autoconfig.h | 35 +++++++++++++------ build/inc/upnpconfig.h | 76 ++++++++++++++++++++++-------------------- 2 files changed, 63 insertions(+), 48 deletions(-) diff --git a/build/inc/autoconfig.h b/build/inc/autoconfig.h index 39e85b9..7121f57 100644 --- a/build/inc/autoconfig.h +++ b/build/inc/autoconfig.h @@ -67,9 +67,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIMEB_H 1 - /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 @@ -82,6 +79,13 @@ /* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WS2TCPIP_H */ + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + /* Define to 1 to prevent compilation of assert() */ #define NDEBUG 1 @@ -101,13 +105,13 @@ #define PACKAGE_NAME "libupnp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libupnp 1.4.7" +#define PACKAGE_STRING "libupnp 1.6.8" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libupnp" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.7" +#define PACKAGE_VERSION "1.6.8" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -116,6 +120,12 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* see upnpconfig.h */ +/* #undef UPNP_ENABLE_IPV6 */ + +/* see upnpconfig.h */ +#define UPNP_ENABLE_NOTIFICATION_REORDERING 1 + /* see upnpconfig.h */ #define UPNP_HAVE_CLIENT 1 @@ -131,20 +141,23 @@ /* see upnpconfig.h */ #define UPNP_HAVE_WEBSERVER 1 +/* Do not use pthread_rwlock_t */ +#define UPNP_USE_RWLOCK 1 + /* see upnpconfig.h */ #define UPNP_VERSION_MAJOR 1 /* see upnpconfig.h */ -#define UPNP_VERSION_MINOR 4 +#define UPNP_VERSION_MINOR 6 /* see upnpconfig.h */ -#define UPNP_VERSION_PATCH 7 +#define UPNP_VERSION_PATCH 8 /* see upnpconfig.h */ -#define UPNP_VERSION_STRING "1.4.7" +#define UPNP_VERSION_STRING "1.6.8" /* Version number of package */ -#define VERSION "1.4.7" +#define VERSION "1.6.8" /* File Offset size */ #define _FILE_OFFSET_BITS 64 @@ -153,7 +166,7 @@ /* #undef _LARGEFILE_SOURCE */ /* Large files support */ -#define _LARGE_FILE_SOURCE +#define _LARGE_FILE_SOURCE /**/ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -164,5 +177,5 @@ /* Define to `unsigned int' if does not define. */ /* #undef size_t */ -/* Substitute for socklen_t */ +/* Type for storing the length of struct sockaddr */ /* #undef socklen_t */ diff --git a/build/inc/upnpconfig.h b/build/inc/upnpconfig.h index 352b101..5e2a71a 100644 --- a/build/inc/upnpconfig.h +++ b/build/inc/upnpconfig.h @@ -1,35 +1,35 @@ /* upnp/inc/upnpconfig.h. Generated from upnpconfig.h.in by configure. */ -// -*- C -*- -/////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2006 Rémi Turboult -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither name of Intel Corporation nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////// +/* -*- C -*- */ +/******************************************************************************* + * + * Copyright (c) 2006 Rémi Turboult + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + ******************************************************************************/ #ifndef UPNP_CONFIG_H #define UPNP_CONFIG_H @@ -40,20 +40,20 @@ ***************************************************************************/ /** The library version (string) e.g. "1.3.0" */ -#define UPNP_VERSION_STRING "1.4.7" +#define UPNP_VERSION_STRING "1.6.8" /** Major version of the library */ #define UPNP_VERSION_MAJOR 1 /** Minor version of the library */ -#define UPNP_VERSION_MINOR 4 +#define UPNP_VERSION_MINOR 6 /** Patch version of the library */ -#define UPNP_VERSION_PATCH 7 +#define UPNP_VERSION_PATCH 8 /** The library version (numeric) e.g. 10300 means version 1.3.0 */ #define UPNP_VERSION \ - ((UPNP_VERSION_MAJOR*100 + UPNP_VERSION_MINOR)*100 + UPNP_VERSION_PATCH) + ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH) @@ -91,7 +91,9 @@ * (i.e. configure --enable-tools) : file is available */ #define UPNP_HAVE_TOOLS 1 +/** Defined to 1 if the library has been compiled with ipv6 support + * (i.e. configure --enable-ipv6) */ +/* #undef UPNP_ENABLE_IPV6 */ -#endif // UPNP_CONFIG_H - +#endif /* UPNP_CONFIG_H */