Creating a tag for release 1.6.0.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/tags/release-1.6.0@211 119443c7-1b9e-41f8-b6fc-b9c35fce742c
Creating branch 1.6.x.
2007-06-23 14:24:54 +00:00 · 2007-06-23 14:23:29 +00:00 · 2007-06-10 19:20:33 +00:00 · 2007-06-10 03:54:47 +00:00 · 2007-06-10 03:54:30 +00:00 · 2007-06-09 13:48:06 +00:00
80 changed files with 11374 additions and 4315 deletions
--- a/263
+++ b/263
@@ -1,6 +1,253 @@
-*************************************************************************
+*******************************************************************************
+Version 1.6.0
+*******************************************************************************
+
+2007-06-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* More fixes to Mac OS X and NetBSD from Rene Hexel:
+	[pupnp-devel] NetBSD & Mac OS X packages and patches
+
+	  Okay, I found a couple more things.  I have attached a patch file
+	against the trunk (version 206) that make the repository code compile
+	and run on both Mac OS X and NetBSD.
+
+	This fixes the following issues:
+
+	   upnp/src/api/upnpapi.c: SIOCGIFCONF didn't work properly, use
+	getifaddrs() instead (on BSD systems).
+
+	  threadutil/src/ThreadPool.c: priorities only work if
+	_POSIX_PRIORITY_SCHEDULING is defined (and greater than 0).
+
+	  threadutil/src/LinkedList.c and threadutil/src/iasnprintf.c: use
+	stdlib.h instead of malloc.h on all BSD systems (not just FreeBSD).
+	This is important, because malloc.h does not exist on Darwin/Mac OS X.
+
+	  Cheers
+	      ,
+	   Rene
+
+2007-06-09 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* [pupnp-devel] NetBSD & Mac OS X packages and patches.
+	Rene Hexel's <rh@netbsd.org> patch to compile in NetBSD and Mac OS X.
+
+2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Updated the macro files acx_pthread.m4, ax_cflags_gcc_option.m4,
+	ax_cflags_warn_all.m4, m4/ax_cflags_warn_all_ansi.m4,
+	m4/type_socklen_t.m4.
+
+2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fixed an issue with the instalation of the file upnpdebug.h. Since
+	the last modifications that removed the macro DEBUV_ONLY, this file
+	must be installed even on a non-debug build.
+
+2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 1711325 ] Bad DestAddr in Upnp_Discovery structure
+	Submitted By: Bob Ciora
+	The field DestAddr of the structure Upnp_Discovery is now a full
+	SOCKADDRIN instead of a pointer to SOCKADDRIN. Commented code sugests
+	that in a previous moment, the function ssdp_handle_ctrlpt_msg() did
+	not use a postponed thread to call ctrlpt_callback(). Now the code
+	uses a thread, and most probably the original data would get lost and
+	the pointer would point to an invalid memory region. This fix caused
+	an interface change in the library and the minor library version was
+	bumped. Also, the libtool library numbers were changed accordingly.
+
+2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added support for the Basic Device
+	(http://www.upnp.org/standardizeddcps/basic.asp) as suggested by
+	Titus Winters.
+
+2007-05-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fixed the file libupnp.pc.in to generate a correct path for the
+	include files.
+
+2007-05-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Removing the Dbg_Level, InitLog, SetLogFileNames and CloseLog
+	defines. These were just aliases, no reason to keep them.
+
+2007-05-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Changed the comments of the include files that expose the UPnP API
+	to use only C89 comments and no C99 comments.
+
+2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
+	* Added tvcombo sample that demonstrates coexistence of a device and a
+	control point in the same application.
+
+2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
+	* SF Tracker FR [ 1570020 ].
+	* Enable both device and control point in the same application. Resolve
+	deadlock in the SSDP processing threads.
+	* Fix Threadpool expansion condition.
+	Thanks to Siva Chandran P. for the original patch.
+
+2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
+	* Modified tvdevice (control and picture) service descriptions to make
+	compatible with WinXP/IE control point. 'in' arguments must appear before
+	'out' arguments in argument list.
+	Thanks to Martin Tremblay for pointing out the solution originally provided
+	by MORIOKA Yasuhiro.
+
+2007-05-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* More MSVC fixes, using XINLINE instead of inline, MSVC has troubles
+	with inline. Thanks to David Maass for reporting.
+	* Changed XINLINE to UPNP_INLINE.
+
+2007-05-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added the file build/inc/msvc/inttypes.h. This file is for use with
+	MSVC only, because it does not provide C99 compatibility.
+
+2007-05-18 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Removed all uses of the DEVICEONLY(x) macro.
+
+2007-05-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Removed all uses of the DBGONLY(x) macro. A static inline empty
+	function now is used and the compiler takes care of optimizing it out.
+
+2007-05-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fixed a bug in UpnpPrintf, function could call va_start() and return
+	befor calling va_end().
+
+2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* EXPORT_SPEC missing on some declarations in ixml/inc/ixml.h.
+	Thanks to David Maass.
+
+2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* sizeof is unsigned, so %zu is more adequate than %zd.
+
+2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Using an invented printf directive PRIzu that on MSVC
+	expands to "lu", and on normal C99 compilers expands to "zu".
+
+2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Rewrote raw_find_str. Now it no longer uses strcasestr(), but it
+	transforms the first input buffer into lowercase.
+
+2007-05-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fix for debug printf format strings. size_t are not expected
+	in a string format like "%.*s".
+
+2007-05-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added inttypes.h as a header requirement in configure.ac.
+
+2007-05-11 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Moved upnp_tv_ctrlpt and upnp_tv_device executables from folder
+	upnp to folder upnp/sample. Moved folder upnp/sample/tvdevice/web
+	to folder upnp/sample/web. This way, if someone compiles the
+	tarball and executes upnp_tv_device from its creation directory,
+	there will be no error -108 for not finding directory web.
+
+*******************************************************************************
+Version 1.4.6
+*******************************************************************************
+
+2007-04-19 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fix for freebsd host_os in configure.ac.
+
+*******************************************************************************
+Version 1.4.5
+*******************************************************************************
+
+2007-04-19 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Case insensitive comparison in raw_find_str() (httpparser.c) as
+	suggested by Craig Nelson in SF Tracker [ 1689382 ] DLINK DIR-625
+	patch.
+
+2007-04-07 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
+	* Fix for a bug in makeAction where va_arg was beeing called one
+	extra time.
+
+2007-04-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Tracker [ 1703533 ] Patch to make it compile under FreeBSD
+	Submitted By: Timothy Redaelli - drittz
+	I made some patches to make it compile under FreeBSD using
+	gethostbyaddr_r when supported.
+
+2007-04-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* [pupnp-devel] Type mixup on x86_64 causes UPNP_E_OUTOF_MEMORY
+	Submitted By: Glen Masgai
+	after an UpnpSendActionAsync() for example, i get UPNP_E_OUTOF_MEMORY
+	in the callback using 1.4.4 on a x86_64 system. This happens in
+	http_MakeMessage(), which in some cases get called with wrong types
+	(int instead of size_t) in combination with format "b" and "Q".
+	The attached patch should fix this.
+
+*******************************************************************************
+Version 1.4.4
+*******************************************************************************
+
+2007-04-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Tracker [ 1695399 ] Typo in util.h
+	Submitted By: Luke Kim - nereusuj
+	Unix sleep is in seconds but WIN32 Sleep is in milliseconds.
+
+2007-04-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Tracker [ 1652827 ] UpnpRegisterRootDevice returned -104
+	Submitted By: Michael Andersen - miwer
+	
+	Issue was found to be related to sizeof (size_t) != sizeof (int)
+	on AMD64 systems. Emil Ljungdahl's AMD64 patch has been applied along
+	with some other fixes. Original user report follows:
+
+	When I run upnpd I get the above mentioned error (UPNP_E_OUTOF_MEMORY).
+	I've tried with 1.4.1 and 1.4.2-RC3, it's the same. I don't understand why,
+	because I have plenty of RAM, and I even tried closing some applications,
+	but it didn't help.
+
+	$ upnpd eth1 br0
+
+	The following is logged in the /var/log/messages:
+	Feb 6 01:33:47 server upnpd[6933]: Error registering the root device with
+	descDocUrl: http://192.168.0.1:49152/gatedesc.xml
+	Feb 6 01:33:47 server upnpd[6933]: UpnpRegisterRootDevice returned -104
+
+
+	I tried enabling debugging and it looks like it cannot allocate memory
+	through the membuffer_append function. It's wierd because it's only a few
+	bytes.
+
+	Please note, that I enabled some extra debugging lines that were commented,
+	in order to get more information. See attached files.
+
+*******************************************************************************
+Version 1.4.3
+*******************************************************************************
+
+2007-03-13 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Tracker [ 1663004 ] Compile on Cygwin
+	Submitted By: Jon Foster - jongfoster
+	This patch gives basic support for building under Cygwin - it compiles,
+	links, and a simple UPnP device application can initialise. I'm not sure
+	if it actually works yet, but this is definitely a step in the right
+	direction.
+	
+	Patch is against the 1.4.1 release. Changes are:
+	
+	* threadutil/inc/ithread.h: Fix the ithread mutex support to use
+	documented, portable APIs (if present) rather than the Non-Portable (_NP)
+	ones it uses now. This is required because Cygwin implements only the
+	portable API.
+	
+	* threadutil/src/ThreadPool.c: Fake SetPolicyType() to do nothing on Cygwin
+	because otherwise it fails. Should probably investigate why it fails and
+	add a proper implementation later.
+	
+	* upnp/src/api/upnpapi.c: On Cygwin, zero out the GlobalHndMutex structure
+	before initialising it. Without this, the initialisation fails. This
+	appears to be a bug in Cygwin.
+	
+	* upnp/src/genlib/net/uri/uri.c: Use gethostbyname() on Cygwin.
+	
+2007-03-05 Oxy <oxygenic(at)users.sourceforge.net>
+	* Code adapted and typedefs added to compile cleanly under Windows
+	with Borland C++ Builder and MS Visual C++
+
+2007-03-03 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	
+	* Fixed nasty segmentation fault bug on membuffer.c.
+	
+*******************************************************************************
 Version 1.4.2
-*************************************************************************
+*******************************************************************************

 2007-02-09 Marcelo Jimenez <mroberto(at)users.sourceforge.net>

@@ -102,9 +349,9 @@ Version 1.4.2
 	* support for large files (>2 GBytes) added


-*************************************************************************
+*******************************************************************************
 Version 1.4.1
-*************************************************************************
+*******************************************************************************

 2006-07-07 Oxy <virtual_worlds(at)gmx.de>

@@ -135,9 +382,9 @@ Version 1.4.1
 	* Patch to fix memory leaks and reasons for crashes added (thanks
 	to loigu)

-*************************************************************************
+*******************************************************************************
 Version 1.4.0
-*************************************************************************
+*******************************************************************************

 2006-05-26 Oxy <virtual_worlds(at)gmx.de>

@@ -163,9 +410,9 @@ Version 1.4.0
 	
 	* Bugfix for M-Search packet

-*************************************************************************
+*******************************************************************************
 FORK FROM DEAD libupnp
-*************************************************************************
+*******************************************************************************

 2006-04-29  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

--- a/1257
+++ b/1257
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2006/04/29 20:12:50 r3mi Exp $
 #
 # Top-level "Makefile.am" for libupnp
 #
@@ -9,7 +8,11 @@ ACLOCAL_AMFLAGS = -I m4

 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-samples

-SUBDIRS = ixml threadutil upnp docs/dist
+SUBDIRS = \
+	ixml \
+	threadutil \
+	upnp \
+	docs/dist


 EXTRA_DIST = \
@@ -23,7 +26,8 @@ EXTRA_DIST = \
 	build/libupnp.dsw \
 	build/inc/autoconfig.h \
 	build/inc/config.h \
-	build/inc/upnpconfig.h
+	build/inc/upnpconfig.h \
+	build/msvc/inttypes.h


 # This variable must have 'exec' in its name, in order to be installed 
@@ -31,11 +35,12 @@ EXTRA_DIST = \
 pkgconfigexecdir = $(libdir)/pkgconfig
 pkgconfigexec_DATA = libupnp.pc

+
 $(pkgconfigexec_DATA): config.status


 if WITH_DOCUMENTATION
-    doc_DATA = LICENSE README NEWS TODO THANKS
+	doc_DATA = LICENSE README NEWS TODO THANKS
 endif


--- a/8
+++ b/8
@@ -7,22 +7,30 @@ Here is a list of these people. Help us keep it complete and
 exempt of errors.

 - Arno Willig
+- Bob Ciora
 - Chaos
+- Craig Nelson
 - David Maass
+- Emil Ljungdahl
 - Erik Johansson
 - Eric Tanguy
 - Erwan Velu
 - Fredrik Svensson
+- Glen Masgai
 - Jiri Zouhar
 - John Dennis
 - Jonathan (no_dice)
 - Leuk_He
 - Loigu
+- Luke Kim
 - Marcelo Roberto Jimenez
 - Markus Strobl
 - Nektarios K. Papadopoulos
 - Oskar Liljeblad
 - Michael (Oxy)
 - Paul Vixie
+- Rene Hexel
 - Siva Chandran
+- Timothy Redaelli
+- Titus Winters

--- a/4
+++ b/4
@@ -13,7 +13,3 @@ autoreconf --force --install -Wall -Wno-obsolete $* || exit 1
 echo "Now run ./configure and then make."
 exit 0

-
-
-
-
--- a/build/inc/autoconfig.h
+++ b/build/inc/autoconfig.h
@@ -1,4 +1,4 @@
-/* autoconfig.h.  Generated by configure.  */
+/* autoconfig.h.  Generated from autoconfig.h.in by configure.  */
 /* autoconfig.h.in.  Generated from configure.ac by autoheader.  */

 /* Define to 1 to compile debug code */
@@ -19,15 +19,18 @@
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1

+/* Define to 1 if you have the `ftime' function. */
+#define HAVE_FTIME 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1

+/* Define to 1 if you have the `compat' library (-lcompat). */
+/* #undef HAVE_LIBCOMPAT */
+
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1

-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1

@@ -92,19 +95,19 @@
 #define PACKAGE "libupnp"

 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "virtual_worlds@gmx.de"
+#define PACKAGE_BUGREPORT "mroberto@users.sourceforge.net"

 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libupnp"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libupnp 1.4.0"
+#define PACKAGE_STRING "libupnp 1.4.7"

 /* 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.0"
+#define PACKAGE_VERSION "1.4.7"

 /* Define to necessary symbol if this constant uses a non-standard name on
   your system. */
@@ -135,27 +138,30 @@
 #define UPNP_VERSION_MINOR 4

 /* see upnpconfig.h */
-#define UPNP_VERSION_PATCH 0
+#define UPNP_VERSION_PATCH 7

 /* see upnpconfig.h */
-#define UPNP_VERSION_STRING "1.4.0"
+#define UPNP_VERSION_STRING "1.4.7"

 /* Version number of package */
-#define VERSION "1.4.0"
+#define VERSION "1.4.7"

-/* Number of bits in a file offset, on hosts where this is settable. */
+/* File Offset size */
 #define _FILE_OFFSET_BITS 64

 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 /* #undef _LARGEFILE_SOURCE */

-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
+/* Large files support */
+#define _LARGE_FILE_SOURCE 

 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */

 /* Substitute for socklen_t */
--- a/build/inc/config.h
+++ b/build/inc/config.h
@@ -34,7 +34,6 @@

 #include "autoconfig.h"

-#define MAX_JOBS_TOTAL 10

 /** @name Compile time configuration options
 *  The Linux SDK for UPnP Devices contains some compile-time parameters 
@@ -96,6 +95,17 @@
 #define MAX_THREADS 12 
 //@}

+/** @name MAX_JOBS_TOTAL
+ *  The {\tt MAX_JOBS_TOTAL} constant determines the maximum number of jobs
+ *  that can be queued. If this limit is reached further jobs will be thrown
+ *  to avoid memory exhaustion. The default value 100.
+ *  (Added by Axis.)
+ */
+
+//@{
+#define MAX_JOBS_TOTAL 100
+//@}
+
 /** @name DEFAULT_SOAP_CONTENT_LENGTH
 * SOAP messages will read at most {\tt DEFAULT_SOAP_CONTENT_LENGTH} bytes.  
 * This prevents devices that have a misbehaving web server to send 
@@ -294,68 +304,40 @@



-/** @name DBGONLY
-          The {\bf DBGONLY} macro allows code to be marked so that it
-          is only included in the DEBUG build and not the release.  To
-          use this macro, put the code inside of the parentheses:
-
-          {\tt DBGONLY(int i;)}
-
-          This will cause a declaration of the integer {\tt i} only
-          in the debug build.
-  */
-
-//@{
-#ifdef DEBUG
- #define DBGONLY(x) x
-#else
- #define DBGONLY(x)
-#endif
-//@}
-
-
-
-#undef  EXCLUDE_WEB_SERVER
-#undef  EXCLUDE_MINISERVER
+#undef  EXCLUDE_WEB_SERVER 
+#undef  EXCLUDE_MINISERVER 
 #ifdef  INTERNAL_WEB_SERVER
- #define EXCLUDE_WEB_SERVER 0
- #define EXCLUDE_MINISERVER 0
+#	define EXCLUDE_WEB_SERVER 0
+#	define EXCLUDE_MINISERVER 0
 #else
- #define EXCLUDE_WEB_SERVER 1
- #define EXCLUDE_MINISERVER 1
+#	define EXCLUDE_WEB_SERVER 1
+#	define EXCLUDE_MINISERVER 1
 #endif

 #if EXCLUDE_GENA == 1 && EXCLUDE_SOAP == 1 && EXCLUDE_WEB_SERVER == 1
- #undef  EXCLUDE_MINISERVER
- #define EXCLUDE_MINISERVER 1
- #if INTERNAL_WEB_SERVER
-  #	error "conflicting settings: use configure --disable-webserver"
- #endif
+#	undef  EXCLUDE_MINISERVER 
+#	define EXCLUDE_MINISERVER 1
+#	if INTERNAL_WEB_SERVER
+#		error "conflicting settings: use configure --disable-webserver"
+#	endif
 #endif

 #if EXCLUDE_GENA == 0 || EXCLUDE_SOAP == 0 || EXCLUDE_WEB_SERVER == 0
- #undef  EXCLUDE_MINISERVER
- #define EXCLUDE_MINISERVER 0
- #if EXCLUDE_WEB_SERVER == 0 && !defined INTERNAL_WEB_SERVER
-  #error "conflicting settings : use configure --enable-webserver"
- #endif
+#	undef  EXCLUDE_MINISERVER 
+#	define EXCLUDE_MINISERVER 0
+#	if EXCLUDE_WEB_SERVER == 0 && !defined INTERNAL_WEB_SERVER
+#		error "conflicting settings : use configure --enable-webserver"
+#	endif
 #endif



 #ifdef INCLUDE_CLIENT_APIS
- #define CLIENTONLY(x) x
-#else
- #define CLIENTONLY(x)
-#endif
-
-#ifdef INCLUDE_DEVICE_APIS
- #define DEVICEONLY(x) x
-#else
- #define DEVICEONLY(x)
+#	define CLIENTONLY(x) x
+#else 
+#	define CLIENTONLY(x)
 #endif

 //@}
 #endif

-
--- a/build/inc/upnpconfig.h
+++ b/build/inc/upnpconfig.h
@@ -1,46 +1,46 @@
-/* upnp/inc/upnpconfig.h.  Generated by configure.  */
+/* upnp/inc/upnpconfig.h.  Generated from upnpconfig.h.in by configure.  */
 // -*- C -*-
 ///////////////////////////////////////////////////////////////////////////
 //
 // Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
-// All rights reserved.
+// All rights reserved. 
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
+// 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
+// * 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
+// 
+// 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
+// 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
+#define UPNP_CONFIG_H 


 /***************************************************************************
- * Library version
- ***************************************************************************/
+ * Library version 
+ ***************************************************************************/ 

 /** The library version (string) e.g. "1.3.0" */
-#define UPNP_VERSION_STRING "1.4.0"
+#define UPNP_VERSION_STRING "1.4.7"

 /** Major version of the library */
 #define UPNP_VERSION_MAJOR 1
@@ -49,7 +49,7 @@
 #define UPNP_VERSION_MINOR 4

 /** Patch version of the library */
-#define UPNP_VERSION_PATCH 0
+#define UPNP_VERSION_PATCH 7

 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
@@ -59,25 +59,25 @@

 /***************************************************************************
 * Library optional features
- ***************************************************************************/
+ ***************************************************************************/ 

 /*
- * The following defines can be tested in order to know which
+ * The following defines can be tested in order to know which 
 * optional features have been included in the installed library.
 */


-/** Defined to 1 if the library has been compiled with DEBUG enabled
+/** Defined to 1 if the library has been compiled with DEBUG enabled 
 *  (i.e. configure --enable-debug) : <upnp/upnpdebug.h> file is available */
-#undef UPNP_HAVE_DEBUG
+/* #undef UPNP_HAVE_DEBUG */


-/** Defined to 1 if the library has been compiled with client API enabled
+/** Defined to 1 if the library has been compiled with client API enabled 
 *  (i.e. configure --enable-client) */
 #define UPNP_HAVE_CLIENT 1


-/** Defined to 1 if the library has been compiled with device API enabled
+/** Defined to 1 if the library has been compiled with device API enabled 
 *  (i.e. configure --enable-device) */
 #define UPNP_HAVE_DEVICE 1

--- a/build/libupnp.bpr
+++ b/build/libupnp.bpr
@@ -45,7 +45,7 @@
    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
    <RELEASELIBPATH value="$(BCB)\lib\release"/>
    <LINKER value="tlink32"/>
-    <USERDEFINES value="WIN32;LIBUPNP_EXPORTS"/>
+    <USERDEFINES value="WIN32;LIBUPNP_EXPORTS;UPNP_USE_BCBPP"/>
    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
    <MAINSOURCE value="libupnp.bpf"/>
    <INCLUDEPATH value="..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc;..\..\pthreads-w32-1-10-0-release"/>
@@ -100,19 +100,21 @@ Item1=..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig
 Item2=..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc

 [HistoryLists\hlLibraryPath]
-Count=2
-Item0=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib;D:\DEVELOP\pthreads-w32-1-10-0-release
-Item1=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib
+Count=3
+Item0=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib;..\..\pthreads-w32-1-10-0-release
+Item1=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib;D:\DEVELOP\pthreads-w32-1-10-0-release
+Item2=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib

 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl

 [HistoryLists\hlConditionals]
-Count=3
-Item0=WIN32;LIBUPNP_EXPORTS
-Item1=WIN32;EXPORT_SPEC
-Item2=WIN32
+Count=4
+Item0=WIN32;LIBUPNP_EXPORTS;UPNP_USE_BCBPP
+Item1=WIN32;LIBUPNP_EXPORTS
+Item2=WIN32;EXPORT_SPEC
+Item3=WIN32

 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl
--- a/build/libupnp.dsp
+++ b/build/libupnp.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I ".\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /D "PTW32_STATIC_LIB" /D "UPNP_STATIC_LIB" /FR /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I ".\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /D "PTW32_STATIC_LIB" /D "UPNP_STATIC_LIB" /D "UPNP_USE_MSVCPP" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /machine:I386
 # SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "libupnp - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I "..\build\inc" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I "..\build\inc" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /D "UPNP_USE_MSVCPP" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

 !ENDIF 

--- a/build/msvc/inttypes.h
+++ b/build/msvc/inttypes.h
@@ -0,0 +1,301 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. 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.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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 _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <stdint.h>
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+
+#endif // _MSC_INTTYPES_H_ ]
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
 # -*- Autoconf -*-
-# $Id: configure.ac,v 1.11 2006/04/09 13:59:44 r3mi Exp $
 #
 # Top-level configure.ac file for libupnp
 #
@@ -10,7 +9,7 @@

 AC_PREREQ(2.60)

-AC_INIT([libupnp], [1.4.2], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.0], [mroberto@users.sourceforge.net])
 # *Independently* of the above libupnp package version, the libtool version
 # of the 3 libraries need to be updated whenever there is a change released :
 # "current:revision:age" (this is NOT the same as the package version), where:
@@ -35,11 +34,35 @@ AC_INIT([libupnp], [1.4.2], [mroberto@users.sourceforge.net])
 #	current: 2 -> 3
 #	revisiion: 3 -> 0
 #	age: 0 -> 1
-# - Code has changed in upnp (revision 2 -> 3)
+# - Code has changed in upnp
 #	revision: 2 -> 3
-AC_SUBST([LT_VERSION_IXML],       [2:3:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
-AC_SUBST([LT_VERSION_UPNP],       [2:3:0])
+#
+# For release 1.4.6, we had:
+#AC_SUBST([LT_VERSION_IXML],       [2:3:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
+#AC_SUBST([LT_VERSION_UPNP],       [2:3:0])
+#
+# "current:revision:age"
+#
+# - Code has changed in ixml
+#	revision: 3 -> 4
+# - Code has changed in threadutil
+#	revision: 0 -> 1
+# - Code has changed in upnp
+#	revision: 3 -> 4
+# - Interface changed in upnp
+#	current: 2 -> 3
+#	revision: 4 -> 0
+# - Interface removed in upnp
+#	age: 0 -> 0
+#
+# For release 1.6.0, we had:
+#AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1])
+#AC_SUBST([LT_VERSION_UPNP],       [3:0:0])
+AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1])
+AC_SUBST([LT_VERSION_UPNP],       [3:0:0])


 AC_CONFIG_AUX_DIR(config.aux)
@@ -48,6 +71,11 @@ AC_CONFIG_SRCDIR(upnp/inc/upnp.h)

 AM_INIT_AUTOMAKE([1.8 -Wall foreign subdir-objects dist-bzip2])

+#
+# Get canonical host names in host and host_os
+#
+AC_CANONICAL_HOST
+
 #
 # There are 3 configuration files :
 # 1) "./autoconfig.h" is auto-generated and used only internally during build
@@ -131,11 +159,14 @@ RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
 # version on that.
 docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 AC_MSG_CHECKING([for documentation directory])
-AC_ARG_WITH([documentation], 
-	AS_HELP_STRING([--with-documentation=directory_name],
+AC_ARG_WITH(
+	[documentation], 
+	AS_HELP_STRING(
+		[--with-documentation=directory_name],
 		[where documentation is installed 
 		 @<:@[DATADIR/doc/]AC_PACKAGE_NAME[-]AC_PACKAGE_VERSION@:>@])
-AS_HELP_STRING([--without-documentation],
+AS_HELP_STRING(
+		[--without-documentation],
 		[do not install the documentation]),
 	[],
 	[with_documentation=no])
@@ -159,25 +190,40 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_EGREP

-
 #
 # Default compilation flags
 #
-if test x"$enable_debug" = xyes; then
-	# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
-	:
-else
-	# add optimise for size
-	AX_CFLAGS_GCC_OPTION([-Os])
-fi
+echo "--------------------- Default compilation flags -------------------------------"
+echo host is $host
+echo host_os is $host_os
+case $host_os in
+freebsd*)
+	echo "Using FreeBSD specific compiler settings"
+	# Put FreeBSD specific compiler flags here
+	;;
+*)
+	echo "Using non-specific system compiler settings"
+	if test x"$enable_debug" = xyes; then
+		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
+		:
+	else
+		# add optimise for size
+		AX_CFLAGS_GCC_OPTION([-Os])
+	fi
+	;;
+esac
+
 AX_CFLAGS_WARN_ALL
+echo "-------------------------------------------------------------------------------"
+

 #
 # Lot's of stuff to ensure large file support
 #
+AC_TYPE_SIZE_T
 AC_TYPE_OFF_T
-AC_DEFINE(_LARGE_FILE_SOURCE, [], [Large files support])
-AC_DEFINE(_FILE_OFFSET_BITS, [64], [File Offset size])
+AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
+AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])


 #
@@ -186,7 +232,25 @@ AC_DEFINE(_FILE_OFFSET_BITS, [64], [File Offset size])
 AC_HEADER_STDC
 # libupnp code doesn't use autoconf variables yet,
 # so just abort if a header file is not found.
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h],[],[AC_MSG_ERROR([required header file missing])])
+AC_CHECK_HEADERS(
+	[ \
+	arpa/inet.h \
+	fcntl.h \
+	inttypes.h \
+	limits.h \
+	netdb.h \
+	netinet/in.h \
+	stdlib.h \
+	string.h \
+	sys/ioctl.h \
+	sys/socket.h \
+	sys/time.h \
+	sys/timeb.h \
+	syslog.h \
+	unistd.h \
+	],
+	[],
+	[AC_MSG_ERROR([required header file missing])])


 #
@@ -202,25 +266,29 @@ TYPE_SOCKLEN_T
 #
 AC_FUNC_VPRINTF
 AC_FUNC_FSEEKO
+AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])


 #
 # Checks for POSIX Threads
 #
-ACX_PTHREAD([],[AC_MSG_ERROR([POSIX threads are required to build this program])])
+ACX_PTHREAD(
+	[],
+	[AC_MSG_ERROR([POSIX threads are required to build this program])])


+AC_CONFIG_FILES([
+	Makefile
+	ixml/Makefile
+	ixml/doc/Makefile
+	threadutil/Makefile
+	upnp/Makefile
+	upnp/doc/Makefile
+	upnp/sample/Makefile
+	docs/dist/Makefile
+	libupnp.pc
+	])


-AC_CONFIG_FILES([Makefile
-		 ixml/Makefile
-		 ixml/doc/Makefile
-                 threadutil/Makefile
-		 upnp/Makefile
-		 upnp/doc/Makefile
-		 docs/dist/Makefile
-		 libupnp.pc
-                 ])
-
 AC_OUTPUT

--- a/ixml/inc/ixml.h
+++ b/ixml/inc/ixml.h
@@ -1,59 +1,61 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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 _IXML_H_
 #define _IXML_H_

+
 #include <stdio.h>
 #include <string.h>
-//#include <malloc.h>
 #include <assert.h>

+
 #ifdef WIN32
- #ifndef UPNP_STATIC_LIB
-  #ifdef LIBUPNP_EXPORTS
-  // set up declspec for dll export to make functions visible to library users
-   #define EXPORT_SPEC __declspec(dllexport)
-  #else
-   #define EXPORT_SPEC __declspec(dllimport)
-  #endif
- #else
-  #define EXPORT_SPEC
- #endif
+	#ifndef UPNP_STATIC_LIB
+		#ifdef LIBUPNP_EXPORTS
+			/* set up declspec for dll export to make functions visible to library users */
+			#define EXPORT_SPEC __declspec(dllexport)
+		#else
+			#define EXPORT_SPEC __declspec(dllimport)
+		#endif
+	#else
+		#define EXPORT_SPEC
+	#endif
 #else
- #define EXPORT_SPEC
+	#define EXPORT_SPEC
 #endif

 typedef int BOOL;

+
 #define DOMString   char *


@@ -88,7 +90,7 @@ typedef int BOOL;
 * etc., refer to section 1.1 of the DOM2-Core recommendation.
 */

-//@{
+/*! @{ */

 /*================================================================
 *
@@ -121,7 +123,7 @@ typedef enum
 *
 *=================================================================*/
 typedef enum 
-{   // see DOM spec
+{   /* see DOM spec */
    IXML_INDEX_SIZE_ERR                 = 1,
    IXML_DOMSTRING_SIZE_ERR             = 2,
    IXML_HIERARCHY_REQUEST_ERR          = 3,
@@ -240,7 +242,7 @@ extern "C" {
 * its functionality.  For more information, refer to DOM2-Core page 34.
 */

-//@{
+/*! @{ */

  /** Returns the name of the {\bf Node}, depending on what type of 
   *  {\bf Node} it is, in a read-only string. Refer to the table in the 
@@ -620,7 +622,7 @@ ixmlNode_cloneNode(IXML_Node *nodeptr,
   */

 EXPORT_SPEC BOOL    
-ixmlNode_hasAttributes(IXML_Node *node  
+ixmlNode_hasAttributes(IXML_Node *nodeptr
 		         /** The {\bf Node} to query for attributes. */
                      );

@@ -630,11 +632,11 @@ ixmlNode_hasAttributes(IXML_Node *node
   */

 EXPORT_SPEC void    
-ixmlNode_free(IXML_Node *IXML_Node  
+ixmlNode_free(IXML_Node *nodeptr
 		/** The {\bf Node} to free. */
             );

-//@}
+/*! @} */

 /*================================================================
 *
@@ -649,7 +651,7 @@ ixmlNode_free(IXML_Node *IXML_Node
 * allowable attributes and values for a particular element.  For more 
 * information, refer to the {\it Interface Attr} section in the DOM2-Core.
 */
-//@{
+/*! @{ */


  /** Frees an {\bf Attr} node.
@@ -662,7 +664,7 @@ ixmlAttr_free(IXML_Attr *attrNode
 		/** The {\bf Attr} node to free.  */
             );

-//@}
+/*! @} */


 /*================================================================
@@ -680,7 +682,7 @@ ixmlAttr_free(IXML_Attr *attrNode
 * information, refer to the {\it Interface CDATASection} section in the
 * DOM2-Core.
 */
-//@{
+/*! @{ */


  /** Initializes a {\bf CDATASection} node.
@@ -704,7 +706,7 @@ ixmlCDATASection_free(IXML_CDATASection *nodeptr
 		        /** The {\bf CDATASection} node to free. */
                     );

-//@}
+/*! @} */

 /*================================================================
 *
@@ -719,7 +721,7 @@ ixmlCDATASection_free(IXML_CDATASection *nodeptr
 * primary interface to the elements of the document.  For more information,
 * refer to the {\it Interface Document} section in the DOM2Core.
 */
-//@{
+/*! @{ */

  /** Initializes a {\bf Document} node.
   *
@@ -947,7 +949,7 @@ ixmlDocument_getElementsByTagName(IXML_Document *doc,
 				    /** The tag name to find. */
                                 );

-// introduced in DOM level 2
+/* introduced in DOM level 2 */

  /** Creates a new {\bf Element} node in the given qualified name and
   *  namespace URI.
@@ -1128,7 +1130,7 @@ ixmlDocument_importNode(IXML_Document* doc,
 			  /** A pointer to a new {\bf Node} owned by {\bf 
 			      doc}. */
                       );
-//@}
+/*! @} */

 /*================================================================
 *
@@ -1144,7 +1146,7 @@ ixmlDocument_importNode(IXML_Document* doc,
 * extends the {\bf Node} interface and adds more operations to manipulate
 * attributes.
 */
-//@{
+/*! @{ */

  /** Initializes a {\bf IXML_Element} node.
   *
@@ -1314,7 +1316,7 @@ ixmlElement_getElementsByTagName(IXML_Element* element,
 				       search. */
                                );

-// introduced in DOM 2
+/* introduced in DOM 2 */

  /** Retrieves an attribute value using the local name and namespace URI.
   *
@@ -1493,7 +1495,7 @@ ixmlElement_free(IXML_Element* element
 		   /** The {\bf Element} to free. */
                );

-//@}
+/*! @} */

 /*================================================================
 *
@@ -1508,7 +1510,7 @@ ixmlElement_free(IXML_Element* element
 * no particular order.  The {\bf Node} interface uses a {\bf NamedNodeMap}
 * to maintain the attributes of a node.
 */
-//@{
+/*! @{ */

  /** Returns the number of items contained in this {\bf NamedNodeMap}.
   *
@@ -1579,7 +1581,7 @@ ixmlNamedNodeMap_item(IXML_NamedNodeMap *nnMap,
 		        /** The index into the map to remove. */
                     );

-// introduced in DOM level 2
+/* introduced in DOM level 2 */

  /** Retrieves a {\bf Node} from a {\bf NamedNodeMap} specified by
   *  namespace URI and local name.
@@ -1646,7 +1648,7 @@ ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap
 		        /** The {\bf NamedNodeMap to free}. */
                     );

-//@}
+/*! @} */

 /*================================================================
 *
@@ -1661,7 +1663,7 @@ ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap
 * the nodes contained in a {\bf NodeList}.  The DOM2-Core refers to
 * this as being {\it live}.
 */
-//@{
+/*! @{ */

  /** Retrieves a {\bf Node} from a {\bf NodeList} specified by a 
   *  numerical index.
@@ -1701,8 +1703,8 @@ ixmlNodeList_free(IXML_NodeList *nList
 		    /** The {\bf NodeList} to free.  */
                 );

-//@} Interface NodeList
-//@} DOM Interfaces
+/*! @} */ /* Interface NodeList */
+/*! @} */ /* DOM Interfaces */

 /**@name IXML API
 * The IXML API contains utility functions that are not part of the standard
@@ -1710,7 +1712,7 @@ ixmlNodeList_free(IXML_NodeList *nList
 * file or buffer, create an XML file from a DOM structure, and manipulate 
 * DOMString objects.
 */
-//@{
+/*! @{ */

 /*================================================================
 * 
@@ -1738,7 +1740,7 @@ ixmlNodeList_free(IXML_NodeList *nList
   *                      of the DOM tree or {\tt NULL} on an error.
   */

-DOMString
+EXPORT_SPEC DOMString
 ixmlPrintDocument(IXML_Document *doc);

  /** Renders a {\bf Node} and all sub-elements into an XML text
@@ -1756,7 +1758,7 @@ ixmlPrintDocument(IXML_Document *doc);
   *                      of the DOM tree or {\tt NULL} on an error.
   */

-DOMString   
+EXPORT_SPEC DOMString   
 ixmlPrintNode(IXML_Node *doc  
                /** The root of the {\bf Node} tree to render to XML text. */
             );
@@ -1777,7 +1779,7 @@ ixmlPrintNode(IXML_Node *doc
   *                      of the DOM tree or {\tt NULL} on an error.
   */

-DOMString
+EXPORT_SPEC DOMString
 ixmlDocumenttoString(IXML_Document *doc);

  /** Renders a {\bf Node} and all sub-elements into an XML text
@@ -1809,7 +1811,7 @@ ixmlNodetoString(IXML_Node *doc
   * characters are replaced by the {\bf errorChar}, and invalid "&" entities 
   * are left untranslated. The parsing is then allowed to continue.
   */
-void
+EXPORT_SPEC void
 ixmlRelaxParser(char errorChar);


@@ -1913,6 +1915,7 @@ ixmlFreeDOMString(DOMString buf
 }
 #endif

-//@} IXML API
+/*! @} */ /* IXML API */
+
+#endif  /* _IXML_H_ */

-#endif  // _IXML_H_
--- a/ixml/src/inc/ixmlmembuf.h
+++ b/ixml/src/inc/ixmlmembuf.h
@@ -39,7 +39,7 @@
 #define MAXVAL( a, b ) ( (a) > (b) ? (a) : (b) )

 #ifndef WIN32
- #define	XINLINE inline
+ #define	UPNP_INLINE inline
 #endif

 #define MEMBUF_DEF_SIZE_INC		20
--- a/libupnp.pc.in
+++ b/libupnp.pc.in
@@ -7,6 +7,5 @@ Name: libupnp
 Description: Linux SDK for UPnP Devices
 Version: @VERSION@
 Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
-Cflags: @PTHREAD_CFLAGS@ -I${includedir}
-
+Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp

--- a/m4/acx_pthread.m4
+++ b/m4/acx_pthread.m4
@@ -1,50 +1,88 @@
-dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl @summary figure out how to build C programs using POSIX threads
-dnl
-dnl This macro figures out how to build C programs using POSIX threads.
-dnl It sets the PTHREAD_LIBS output variable to the threads library and
-dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
-dnl C compiler flags that are needed. (The user can also force certain
-dnl compiler flags/libs to be tested by setting these environment
-dnl variables.)
-dnl
-dnl Also sets PTHREAD_CC to any special C compiler that is needed for
-dnl multi-threaded programs (defaults to the value of CC otherwise).
-dnl (This is necessary on AIX to use the special cc_r compiler alias.)
-dnl
-dnl NOTE: You are assumed to not only compile your program with these
-dnl flags, but also link it with them as well. e.g. you should link
-dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
-dnl $LIBS
-dnl
-dnl If you are only building threads programs, you may wish to use
-dnl these variables in your default LIBS, CFLAGS, and CC:
-dnl
-dnl        LIBS="$PTHREAD_LIBS $LIBS"
-dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-dnl        CC="$PTHREAD_CC"
-dnl
-dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-dnl
-dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
-dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
-dnl default action will define HAVE_PTHREAD.
-dnl
-dnl Please let the authors know if this macro fails on any platform, or
-dnl if you have any other suggestions or comments. This macro was based
-dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
-dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
-dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
-dnl We are also grateful for the helpful feedback of numerous users.
-dnl
-dnl @category InstalledPackages
-dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
-dnl @version 2005-06-15
-dnl @license GPLWithACException
+##### http://autoconf-archive.cryp.to/acx_pthread.html
+#
+# SYNOPSIS
+#
+#   ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads.
+#   It sets the PTHREAD_LIBS output variable to the threads library and
+#   linker flags, and the PTHREAD_CFLAGS output variable to any special
+#   C compiler flags that are needed. (The user can also force certain
+#   compiler flags/libs to be tested by setting these environment
+#   variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise).
+#   (This is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these
+#   flags, but also link it with them as well. e.g. you should link
+#   with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+#   $LIBS
+#
+#   If you are only building threads programs, you may wish to use
+#   these variables in your default LIBS, CFLAGS, and CC:
+#
+#          LIBS="$PTHREAD_LIBS $LIBS"
+#          CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#          CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+#   constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads
+#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+#   run it if it is not found. If ACTION-IF-FOUND is not specified, the
+#   default action will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or
+#   if you have any other suggestions or comments. This macro was based
+#   on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/)
+#   (with help from M. Frigo), as well as ac_pthread and hb_pthread
+#   macros posted by Alejandro Forero Cuervo to the autoconf macro
+#   repository. We are also grateful for the helpful feedback of
+#   numerous users.
+#
+# LAST MODIFICATION
+#
+#   2006-05-29
+#
+# COPYLEFT
+#
+#   Copyright (c) 2006 Steven G. Johnson <stevenj@alum.mit.edu>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.

 AC_DEFUN([ACX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
@@ -216,8 +254,12 @@ if test "x$acx_pthread_ok" = xyes; then
        LIBS="$save_LIBS"
        CFLAGS="$save_CFLAGS"

-        # More AIX lossage: must compile with cc_r
-        AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
+        # More AIX lossage: must compile with xlc_r or cc_r
+	if test x"$GCC" != xyes; then
+          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+        else
+          PTHREAD_CC=$CC
+	fi
 else
        PTHREAD_CC="$CC"
 fi
--- a/m4/ax_cflags_gcc_option.m4
+++ b/m4/ax_cflags_gcc_option.m4
@@ -1,48 +1,87 @@
-dnl @synopsis AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
-dnl
-dnl AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
-dnl "checking CFLAGS for gcc -fvomit-frame ... yes" and adds the
-dnl optionflag to CFLAGS if it is understood. You can override the
-dnl shellvar-default of CFLAGS of course. The order of arguments stems
-dnl from the explicit macros like AX_CFLAGS_WARN_ALL.
-dnl
-dnl The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add
-dnl to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
-dnl (since it is possible to use different compilers for C and C++).
-dnl
-dnl The macro is a lot simpler than any special AX_CFLAGS_* macro (or
-dnl ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
-dnl However, if you use this macro in a few places, it would be great
-dnl if you would make up a new function-macro and submit it to the
-dnl ac-archive.
-dnl
-dnl   - $1 option-to-check-for : required ("-option" as non-value)
-dnl   - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
-dnl   - $3 action-if-found : add value to shellvariable
-dnl   - $4 action-if-not-found : nothing
-dnl
-dnl note: in earlier versions, $1-$2 were swapped. We try to detect the
-dnl situation and accept a $2=~/-/ as being the old
-dnl option-to-check-for.
-dnl
-dnl also: there are other variants that emerged from the original macro
-dnl variant which did just test an option to be possibly added.
-dnl However, some compilers accept an option silently, or possibly for
-dnl just another option that was not intended. Therefore, we have to do
-dnl a generic test for a compiler family. For gcc we check "-pedantic"
-dnl being accepted which is also understood by compilers who just want
-dnl to be compatible with gcc even when not being made from gcc
-dnl sources.
-dnl
-dnl see also:
-dnl
-dnl       AX_CFLAGS_SUN_OPTION               AX_CFLAGS_HPUX_OPTION
-dnl       AX_CFLAGS_AIX_OPTION               AX_CFLAGS_IRIX_OPTION
-dnl
-dnl @category C
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl @version 2003-11-04
-dnl @license GPLWithACException
+##### http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html
+#
+# SYNOPSIS
+#
+#   AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
+#
+# DESCRIPTION
+#
+#   AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
+#   "checking CFLAGS for gcc -fvomit-frame ... yes" and adds the
+#   optionflag to CFLAGS if it is understood. You can override the
+#   shellvar-default of CFLAGS of course. The order of arguments stems
+#   from the explicit macros like AX_CFLAGS_WARN_ALL.
+#
+#   The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add
+#   to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
+#   (since it is possible to use different compilers for C and C++).
+#
+#   The macro is a lot simpler than any special AX_CFLAGS_* macro (or
+#   ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
+#   However, if you use this macro in a few places, it would be great
+#   if you would make up a new function-macro and submit it to the
+#   ac-archive.
+#
+#     - $1 option-to-check-for : required ("-option" as non-value)
+#     - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
+#     - $3 action-if-found : add value to shellvariable
+#     - $4 action-if-not-found : nothing
+#
+#   note: in earlier versions, $1-$2 were swapped. We try to detect the
+#   situation and accept a $2=~/-/ as being the old
+#   option-to-check-for.
+#
+#   also: there are other variants that emerged from the original macro
+#   variant which did just test an option to be possibly added.
+#   However, some compilers accept an option silently, or possibly for
+#   just another option that was not intended. Therefore, we have to do
+#   a generic test for a compiler family. For gcc we check "-pedantic"
+#   being accepted which is also understood by compilers who just want
+#   to be compatible with gcc even when not being made from gcc
+#   sources.
+#
+#   see also:
+#
+#         AX_CFLAGS_SUN_OPTION               AX_CFLAGS_HPUX_OPTION
+#         AX_CFLAGS_AIX_OPTION               AX_CFLAGS_IRIX_OPTION
+#
+# LAST MODIFICATION
+#
+#   2006-12-12
+#
+# COPYLEFT
+#
+#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.

 AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
@@ -53,7 +92,8 @@ VAR,[VAR="no, unknown"
 AC_LANG_C
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
+in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
   AC_TRY_COMPILE([],[return 0;],
@@ -85,10 +125,11 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_CXX
+ AC_LANG_CPLUSPLUS
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
+in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
   AC_TRY_COMPILE([],[return 0;],
@@ -122,7 +163,8 @@ VAR,[VAR="no, unknown"
 AC_LANG_C
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
+in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
   AC_TRY_COMPILE([],[return 0;],
@@ -154,10 +196,11 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
 AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_CXX
+ AC_LANG_CPLUSPLUS
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
+in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
+   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
   #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
   AC_TRY_COMPILE([],[return 0;],
--- a/m4/ax_cflags_warn_all.m4
+++ b/m4/ax_cflags_warn_all.m4
@@ -1,27 +1,66 @@
-dnl @synopsis AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
-dnl
-dnl Try to find a compiler option that enables most reasonable
-dnl warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
-dnl which is split up into two AX_CFLAGS_WARN_ALL and
-dnl AX_CFLAGS_WARN_ALL_ANSI
-dnl
-dnl For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
-dnl result is added to the shellvar being CFLAGS by default.
-dnl
-dnl Currently this macro knows about GCC, Solaris C compiler, Digital
-dnl Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
-dnl compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
-dnl 10.0.0.8) C compiler.
-dnl
-dnl  - $1 shell-variable-to-add-to : CFLAGS
-dnl  - $2 add-value-if-not-found : nothing
-dnl  - $3 action-if-found : add value to shellvariable
-dnl  - $4 action-if-not-found : nothing
-dnl
-dnl @category C
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl @version 2003-01-06
-dnl @license GPLWithACException
+##### http://autoconf-archive.cryp.to/ax_cflags_warn_all.html
+#
+# SYNOPSIS
+#
+#   AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
+#
+# DESCRIPTION
+#
+#   Try to find a compiler option that enables most reasonable
+#   warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
+#   which is split up into two AX_CFLAGS_WARN_ALL and
+#   AX_CFLAGS_WARN_ALL_ANSI
+#
+#   For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
+#   result is added to the shellvar being CFLAGS by default.
+#
+#   Currently this macro knows about GCC, Solaris C compiler, Digital
+#   Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
+#   compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
+#   10.0.0.8) C compiler.
+#
+#    - $1 shell-variable-to-add-to : CFLAGS
+#    - $2 add-value-if-not-found : nothing
+#    - $3 action-if-found : add value to shellvariable
+#    - $4 action-if-not-found : nothing
+#
+# LAST MODIFICATION
+#
+#   2006-12-12
+#
+# COPYLEFT
+#
+#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.

 AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl
 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
@@ -72,7 +111,7 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_CXX
+ AC_LANG_CPLUSPLUS
 ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
 in "-pedantic  % -Wall"       dnl   GCC
@@ -115,4 +154,5 @@ dnl   compilers will fail about it. That was needed since a lot of
 dnl   compilers will give false positives for some option-syntax
 dnl   like -Woption or -Xoption as they think of it is a pass-through
 dnl   to later compile stages or something. The "%" is used as a
-dnl   delimimiter. A non-option comment can be given after "%%" marks.
+dnl   delimimiter. A non-option comment can be given after "%%" marks
+dnl   which will be shown but not added to the respective C/CXXFLAGS.
--- a/m4/ax_cflags_warn_all_ansi.m4
+++ b/m4/ax_cflags_warn_all_ansi.m4
@@ -1,27 +1,66 @@
-dnl @synopsis AX_CFLAGS_WARN_ALL_ANSI [(shellvar [,default, [A/NA]])]
-dnl
-dnl Try to find a compiler option that enables most reasonable
-dnl warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
-dnl which is split up into two AX_CFLAGS_WARN_ALL and
-dnl AX_CFLAGS_WARN_ALL_ANSI
-dnl
-dnl For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
-dnl result is added to the shellvar being CFLAGS by default.
-dnl
-dnl Currently this macro knows about GCC, Solaris C compiler, Digital
-dnl Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
-dnl compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
-dnl 10.0.0.8) C compiler.
-dnl
-dnl  - $1 shell-variable-to-add-to : CFLAGS
-dnl  - $2 add-value-if-not-found : nothing
-dnl  - $3 action-if-found : add value to shellvariable
-dnl  - $4 action-if-not-found : nothing
-dnl
-dnl @category C
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl @version 2003-01-06
-dnl @license GPLWithACException
+##### http://autoconf-archive.cryp.to/ax_cflags_warn_all_ansi.html
+#
+# SYNOPSIS
+#
+#   AX_CFLAGS_WARN_ALL_ANSI [(shellvar [,default, [A/NA]])]
+#
+# DESCRIPTION
+#
+#   Try to find a compiler option that enables most reasonable
+#   warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
+#   which is split up into two AX_CFLAGS_WARN_ALL and
+#   AX_CFLAGS_WARN_ALL_ANSI
+#
+#   For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
+#   result is added to the shellvar being CFLAGS by default.
+#
+#   Currently this macro knows about GCC, Solaris C compiler, Digital
+#   Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
+#   compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
+#   10.0.0.8) C compiler.
+#
+#    - $1 shell-variable-to-add-to : CFLAGS
+#    - $2 add-value-if-not-found : nothing
+#    - $3 action-if-found : add value to shellvariable
+#    - $4 action-if-not-found : nothing
+#
+# LAST MODIFICATION
+#
+#   2006-12-12
+#
+# COPYLEFT
+#
+#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.

 AC_DEFUN([AX_CFLAGS_WARN_ALL_ANSI],[dnl
 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
@@ -77,7 +116,7 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all_ansi])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
 VAR,[VAR="no, unknown"
 AC_LANG_SAVE
- AC_LANG_CXX
+ AC_LANG_CPLUSPLUS
 ac_save_[]FLAGS="$[]FLAGS"
 # IRIX C compiler:
 #      -use_readonly_const is the default for IRIX C,
--- a/m4/type_socklen_t.m4
+++ b/m4/type_socklen_t.m4
@@ -1,13 +1,52 @@
-dnl @synopsis TYPE_SOCKLEN_T
-dnl
-dnl Check whether sys/socket.h defines type socklen_t. Please note that
-dnl some systems require sys/types.h to be included before sys/socket.h
-dnl can be compiled.
-dnl
-dnl @category Misc
-dnl @author Lars Brinkhoff <lars@nocrew.org>
-dnl @version 2005-01-11
-dnl @license GPLWithACException
+##### http://autoconf-archive.cryp.to/type_socklen_t.html
+#
+# SYNOPSIS
+#
+#   TYPE_SOCKLEN_T
+#
+# DESCRIPTION
+#
+#   Check whether sys/socket.h defines type socklen_t. Please note that
+#   some systems require sys/types.h to be included before sys/socket.h
+#   can be compiled.
+#
+# LAST MODIFICATION
+#
+#   2005-01-11
+#
+# COPYLEFT
+#
+#   Copyright (c) 2005 Lars Brinkhoff <lars@nocrew.org>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.

 AC_DEFUN([TYPE_SOCKLEN_T],
 [AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
--- a/14
+++ b/14
@@ -0,0 +1,14 @@
+.deps
+.dirstamp
+.libs
+.*.swp
+*~
+Makefile
+Makefile.in
+aclocal.m4
+autoconfig.h*
+autom4te.cache
+config*
+libtool
+libupnp.pc
+stamp-h*
--- a/threadutil/inc/FreeList.h
+++ b/threadutil/inc/FreeList.h
@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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 FREE_LIST_H
 #define FREE_LIST_H
@@ -36,9 +36,6 @@
 extern "C" {
 #endif

-//#include <malloc.h>
-
-
 #include "ithread.h"
 #include <errno.h>

@@ -52,7 +49,7 @@ extern "C" {
 *****************************************************************************/
 typedef struct FREELISTNODE
 {
-	struct FREELISTNODE*next; //pointer to next free node
+	struct FREELISTNODE *next;
 } FreeListNode;


@@ -65,12 +62,10 @@ typedef struct FREELISTNODE
 *****************************************************************************/
 typedef struct FREELIST
 {
-	FreeListNode *head; //head of free list
-	size_t element_size;	//size of elements in free 
- 							//list
- 	int maxFreeListLength; //max size of free structures 
-						 //to keep
-	int freeListLength; //current size of free list
+	FreeListNode *head;
+	size_t element_size;
+ 	int maxFreeListLength;
+	int freeListLength;
        
 }FreeList;

@@ -141,4 +136,5 @@ int FreeListDestroy (FreeList *free_list);
 }
 #endif

-#endif // FREE_LIST_H
+#endif /* FREE_LIST_H */
+
--- a/threadutil/inc/LinkedList.h
+++ b/threadutil/inc/LinkedList.h
@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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 LINKED_LIST_H
 #define LINKED_LIST_H
@@ -70,9 +70,9 @@ typedef int (*cmp_routine)(void *itemA,void *itemB);
 *****************************************************************************/
 typedef struct LISTNODE
 {
-  struct LISTNODE *prev; //previous node
-  struct LISTNODE *next; //next node
-  void *item; //item
+  struct LISTNODE *prev;
+  struct LISTNODE *next;
+  void *item;
 } ListNode;

 /****************************************************************************
@@ -96,12 +96,12 @@ typedef struct LISTNODE
 *****************************************************************************/
 typedef struct LINKEDLIST
 {
-  ListNode head; //head, first item is stored at: head->next
-  ListNode tail; //tail, last item is stored at: tail->prev
-  long size;      //size of list
-  FreeList freeNodeList; //free list to use
-  free_function free_func; //free function to use
-  cmp_routine cmp_func; //compare function to use
+  ListNode head; /* head, first item is stored at: head->next */
+  ListNode tail; /* tail, last item is stored at: tail->prev  */
+  long size;     /* size of list */
+  FreeList freeNodeList;   /* free list to use */
+  free_function free_func; /* free function to use */
+  cmp_routine cmp_func;    /* compare function to use */
 } LinkedList;

 /****************************************************************************
@@ -327,4 +327,5 @@ int ListSize(LinkedList* list);
 }
 #endif

-#endif //LINKED_LIST_H
+#endif /* LINKED_LIST_H */
+
--- a/threadutil/inc/ThreadPool.h
+++ b/threadutil/inc/ThreadPool.h
@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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 THREADPOOL_H
 #define THREADPOOL_H
@@ -36,17 +36,17 @@
 extern "C" {
 #endif

-//Size of job free list
+/* Size of job free list */
 #define JOBFREELISTSIZE 100

 #define INFINITE_THREADS -1

 #define EMAXTHREADS (-8 & 1<<29)

-//Invalid Policy
+/* Invalid Policy */
 #define INVALID_POLICY (-9 & 1<<29)

-//Invalid JOB Id
+/* Invalid JOB Id */
 #define INVALID_JOB_ID (-2 & 1<<29)

 typedef enum duration {SHORT_TERM,PERSISTENT} Duration;
@@ -55,40 +55,31 @@ typedef enum priority {LOW_PRIORITY,
 		       MED_PRIORITY,
 		       HIGH_PRIORITY} ThreadPriority;

-#define DEFAULT_PRIORITY MED_PRIORITY //default priority used by TPJobInit
-#define DEFAULT_MIN_THREADS 1	      //default minimum used by TPAttrInit
-#define DEFAULT_MAX_THREADS 10	      //default max used by TPAttrInit	
-#define DEFAULT_JOBS_PER_THREAD 10    //default jobs per thread used by TPAttrInit
-#define DEFAULT_STARVATION_TIME	500   //default starvation time used by TPAttrInit
-#define DEFAULT_IDLE_TIME 10 * 1000   //default idle time used by TPAttrInit
-#define DEFAULT_FREE_ROUTINE NULL     //default free routine used TPJobInit
-#define DEFAULT_MAX_JOBS_TOTAL 100    //default max jobs used TPAttrInit
+#define DEFAULT_PRIORITY MED_PRIORITY /* default priority used by TPJobInit */
+#define DEFAULT_MIN_THREADS 1	      /* default minimum used by TPAttrInit */
+#define DEFAULT_MAX_THREADS 10	      /* default max used by TPAttrInit	*/
+#define DEFAULT_JOBS_PER_THREAD 10    /* default jobs per thread used by TPAttrInit */
+#define DEFAULT_STARVATION_TIME	500   /* default starvation time used by TPAttrInit */
+#define DEFAULT_IDLE_TIME 10 * 1000   /* default idle time used by TPAttrInit */
+#define DEFAULT_FREE_ROUTINE NULL     /* default free routine used TPJobInit */
+#define DEFAULT_MAX_JOBS_TOTAL 100    /* default max jobs used TPAttrInit */

-#define STATS 1 //always include stats because code change is minimal
+#define STATS 1 /* always include stats because code change is minimal */


-//Statistics
-#ifdef WIN32 // todo: check why STATSONLY fails during compilation
- #undef STATS
+/* Statistics */
+#ifdef WIN32 /* TODO: check why STATSONLY fails during compilation */
+	#undef STATS
 #endif

 #ifdef STATS
- #define STATSONLY(x) x
+	#define STATSONLY(x) x
 #else
- #define STATSONLY(x)
+	#define STATSONLY(x)
 #endif

 #ifdef _DEBUG
- #define DEBUG 1
-#endif
-
-//DEBUGGING
-#ifndef WIN32
- #ifdef DEBUG
-  #define DBGONLY(x) x
- #else
-  #define DBGONLY(x)
- #endif
+	#define DEBUG 1
 #endif

 #include "LinkedList.h"
@@ -101,7 +92,7 @@ typedef enum priority {LOW_PRIORITY,
 #define EXPORT
 typedef int PolicyType;
 #define DEFAULT_POLICY SCHED_OTHER
-#define DEFAULT_SCHED_PARAM 0 //default priority
+#define DEFAULT_SCHED_PARAM 0 /* default priority */

 /****************************************************************************
 * Name: free_routine
@@ -120,25 +111,25 @@ typedef void (*free_routine)(void *arg);
 *****************************************************************************/
 typedef struct THREADPOOLATTR
 {
-  int minThreads;     // minThreads, ThreadPool will always maintain at least
-                      // this many threads
+  int minThreads;     /* minThreads, ThreadPool will always maintain at least
+                         this many threads */

-  int maxThreads;     // maxThreads, ThreadPool will never have more than this
-                      // number of threads
+  int maxThreads;     /* maxThreads, ThreadPool will never have more than this
+                         number of threads */

-  int maxIdleTime;    // maxIdleTime (in milliseconds)
-                      // this is the maximum time a thread will remain idle
-                      // before dying
+  int maxIdleTime;    /* maxIdleTime (in milliseconds)
+                         this is the maximum time a thread will remain idle
+                         before dying */

-  int jobsPerThread;  // jobs per thread to maintain
+  int jobsPerThread;  /* jobs per thread to maintain */

-  int maxJobsTotal;   // maximum number of jobs that can be queued totally.
+  int maxJobsTotal;   /* maximum number of jobs that can be queued totally. */

-  int starvationTime; // the time a low priority or med priority
-	              // job waits before getting bumped
-                      // up a priority (in milliseconds)
+  int starvationTime; /* the time a low priority or med priority
+	                 job waits before getting bumped
+                         up a priority (in milliseconds) */

-  PolicyType schedPolicy; // scheduling policy to use
+  PolicyType schedPolicy; /* scheduling policy to use */

 } ThreadPoolAttr;

@@ -150,12 +141,12 @@ typedef struct THREADPOOLATTR
 *****************************************************************************/
 typedef struct THREADPOOLJOB
 {
-  start_routine func; //function
-  void *arg;          //arg
-  free_routine free_func; //free function
-  struct timeb requestTime; //time of request
-  int priority;       //priority of request
-  int jobId;         //id
+  start_routine func;
+  void *arg;
+  free_routine free_func;
+  struct timeb requestTime;
+  int priority;
+  int jobId;
 } ThreadPoolJob;

 /****************************************************************************
@@ -165,32 +156,32 @@ typedef struct THREADPOOLJOB
 *     Structure to hold statistics
 *****************************************************************************/

-STATSONLY(
+#ifdef STATS

 typedef struct TPOOLSTATS
 {
-  double totalTimeHQ; //total time spent by all jobs in high priority Q
-  int totalJobsHQ;    //total jobs in HQ run so far
-  double avgWaitHQ;   //average wait in HQ
-  double totalTimeMQ; //total time spent by all jobs in med priority Q
-  int totalJobsMQ;    //total jobs in MQ run so far
-  double avgWaitMQ;   //average wait in MQ
-  double totalTimeLQ; //total time spent by all jobs in low priority Q
-  int totalJobsLQ;    //total jobs in LQ run so far
-  double avgWaitLQ;	//average wait in LQ
-  double totalWorkTime; //total time spent working for all threads
-  double totalIdleTime; //total time spent idle for all threads
-  int workerThreads; //number of current workerThreads
-  int idleThreads;   //number of current idle threads
-  int persistentThreads; //number of persistent threads
-  int totalThreads; //total number of current threads
-  int maxThreads; //max threads so far
-  int currentJobsHQ; // current jobs in Q
-  int currentJobsLQ; //current jobs in Q
-  int currentJobsMQ; //current jobs in Q
+  double totalTimeHQ;
+  int totalJobsHQ;
+  double avgWaitHQ;
+  double totalTimeMQ;
+  int totalJobsMQ;
+  double avgWaitMQ;
+  double totalTimeLQ;
+  int totalJobsLQ;
+  double avgWaitLQ;
+  double totalWorkTime;
+  double totalIdleTime;
+  int workerThreads;
+  int idleThreads;
+  int persistentThreads;
+  int totalThreads;
+  int maxThreads;
+  int currentJobsHQ;
+  int currentJobsLQ;
+  int currentJobsMQ;
 }ThreadPoolStats;

-)
+#endif


 /****************************************************************************
@@ -215,24 +206,26 @@ typedef struct TPOOLSTATS

 typedef struct THREADPOOL
 {
-  ithread_mutex_t mutex; //mutex to protect job qs
-  ithread_cond_t condition; //condition variable to signal Q
-  ithread_cond_t start_and_shutdown; //condition variable for start 
-                                     //and stop     
-  int lastJobId; //ids for jobs 
-  int shutdown;   //whether or not we are shutting down
-  int totalThreads;       //total number of threads	
-  int persistentThreads; //number of persistent threads
-  FreeList jobFreeList; //free list of jobs
-  LinkedList lowJobQ;    //low priority job Q
-  LinkedList medJobQ;    //med priority job Q
-  LinkedList highJobQ;   //high priority job Q
-  ThreadPoolJob *persistentJob; //persistent job
+  ithread_mutex_t mutex; /* mutex to protect job qs */
+  ithread_cond_t condition; /* condition variable to signal Q */
+  ithread_cond_t start_and_shutdown; /* condition variable for start 
+                                        and stop */
+  int lastJobId; /* ids for jobs */
+  int shutdown;  /* whether or not we are shutting down */
+  int totalThreads;      /* total number of threads */
+  int persistentThreads; /* number of persistent threads */
+  FreeList jobFreeList;  /* free list of jobs */
+  LinkedList lowJobQ;    /* low priority job Q */
+  LinkedList medJobQ;    /* med priority job Q */
+  LinkedList highJobQ;   /* high priority job Q */
+  ThreadPoolJob *persistentJob; /* persistent job */
 
-  ThreadPoolAttr attr; //thread pool attributes
+  ThreadPoolAttr attr; /* thread pool attributes */
  
-  //statistics 
-  STATSONLY(ThreadPoolStats stats;)
+#ifdef STATS
+  /* statistics */
+  ThreadPoolStats stats;
+#endif
 
 } ThreadPool;

@@ -550,12 +543,15 @@ int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
 *  Returns:
 *      Always returns 0.
 *****************************************************************************/
-STATSONLY( EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats););
+#ifdef STATS
+	EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);

-STATSONLY(EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats););
+	EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats);
+#endif

 #ifdef __cplusplus
 }
 #endif

-#endif //ThreadPool
+#endif /* ThreadPool */
+
--- a/threadutil/inc/TimerThread.h
+++ b/threadutil/inc/TimerThread.h
@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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 TIMERTHREAD_H
 #define TIMERTHREAD_H
@@ -43,9 +43,9 @@ extern "C" {

 #define INVALID_EVENT_ID (-10 & 1<<29)

-//Timeout Types
-//absolute means in seconds from Jan 1, 1970
-//relative means in seconds from current time
+/* Timeout Types */
+/* absolute means in seconds from Jan 1, 1970 */
+/* relative means in seconds from current time */
 typedef enum timeoutType {ABS_SEC,REL_SEC} TimeoutType;


@@ -63,13 +63,13 @@ typedef enum timeoutType {ABS_SEC,REL_SEC} TimeoutType;
 *****************************************************************************/
 typedef struct TIMERTHREAD
 {
-  ithread_mutex_t mutex; //mutex to protect eventQ
-  ithread_cond_t condition; //condition variable
-  int lastEventId;	//last event id
-  LinkedList eventQ; //event q
-  int shutdown;      //whether or not we are shutdown  
-  FreeList freeEvents; //FreeList for events
-  ThreadPool *tp;	 //ThreadPool to use
+  ithread_mutex_t mutex;
+  ithread_cond_t condition;
+  int lastEventId;
+  LinkedList eventQ;
+  int shutdown;
+  FreeList freeEvents;
+  ThreadPool *tp;
 } TimerThread;


@@ -85,9 +85,9 @@ typedef struct TIMERTHREAD
 typedef struct TIMEREVENT
 {
  ThreadPoolJob job;
-  time_t eventTime; //absolute time for event in seconds since Jan 1, 1970
-  Duration persistent;          //long term or short term job
-  int id;                //id of job
+  time_t eventTime; /* absolute time for event in seconds since Jan 1, 1970 */
+  Duration persistent;  /* long term or short term job */
+  int id;
 } TimerEvent;


@@ -188,4 +188,5 @@ int TimerThreadShutdown(TimerThread *timer);
 }
 #endif

-#endif //TIMER_THREAD_H
+#endif /* TIMER_THREAD_H */
+
--- a/threadutil/inc/iasnprintf.h
+++ b/threadutil/inc/iasnprintf.h
@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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.
+ *
+ ******************************************************************************/

 #include <stdarg.h>

--- a/threadutil/inc/ithread.h
+++ b/threadutil/inc/ithread.h
@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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 ITHREADH
 #define ITHREADH
@@ -36,22 +36,30 @@ extern "C" {
 #endif


-#ifdef DEBUG
-#define DEBUG_ONLY(x) x
-#else
-#define DEBUG_ONLY(x)
-#endif
-
 #include <pthread.h>
 #ifndef WIN32
- #include <unistd.h>
+	#include <unistd.h>
 #endif

+#ifdef __FreeBSD__
+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#endif
+
+#ifdef PTHREAD_MUTEX_RECURSIVE
+/* This system has SuS2-compliant mutex attributes.
+ * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
+ */
+#define ITHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_NORMAL
+#define ITHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK
+#else
 #define ITHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_FAST_NP
 #define ITHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE_NP
 #define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK_NP
+#endif
+
 #define ITHREAD_CANCELED PTHREAD_CANCELED
-  
+
  
  /***************************************************************************
   * Name: ithread_t
@@ -181,8 +189,11 @@ extern "C" {
 *      Returns EINVAL if the kind is not supported.
 *      See man page for pthread_mutexattr_setkind_np
 *****************************************************************************/
+#ifdef PTHREAD_MUTEX_RECURSIVE
+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
+#else
 #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
-
+#endif

 /****************************************************************************
 * Function: ithread_mutexattr_getkind_np
@@ -203,7 +214,11 @@ extern "C" {
 *      Always returns 0.
 *      See man page for pthread_mutexattr_getkind_np
 *****************************************************************************/
+#ifdef PTHREAD_MUTEX_RECURSIVE
+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
+#else
 #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
+#endif

  
 /****************************************************************************
@@ -527,26 +542,29 @@ extern "C" {
 #define imillisleep(x) usleep(1000*x)

 #ifdef WIN32
- #ifndef UPNP_STATIC_LIB
-  #ifdef LIBUPNP_EXPORTS
-   // set up declspec for dll export to make functions visible to library users
-   #define EXPORT_SPEC __declspec(dllexport)
-  #else
-   #define EXPORT_SPEC __declspec(dllimport)
-  #endif
- #else
-  #define EXPORT_SPEC
- #endif
+	#ifndef UPNP_STATIC_LIB
+		#ifdef LIBUPNP_EXPORTS
+			/* set up declspec for dll export to make functions visible to library users */
+			#define EXPORT_SPEC __declspec(dllexport)
+		#else
+			#define EXPORT_SPEC __declspec(dllimport)
+		#endif
+	#else
+		#define EXPORT_SPEC
+	#endif
 #else
- #define EXPORT_SPEC
+	#define EXPORT_SPEC
 #endif


-//NK: Added for satisfying the gcc compiler  
+#ifndef PTHREAD_MUTEX_RECURSIVE
+/* NK: Added for satisfying the gcc compiler */
 EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
+#endif

 #ifdef __cplusplus
 }
 #endif

-#endif //ITHREADH
+#endif /* ITHREADH */
+
--- a/threadutil/src/LinkedList.c
+++ b/threadutil/src/LinkedList.c
@@ -30,7 +30,8 @@
 ///////////////////////////////////////////////////////////////////////////

 #include "LinkedList.h"
-#ifdef __FreeBSD__
+#include <sys/param.h>
+#if (defined(BSD) && BSD >= 199306)
 #include <stdlib.h>
 #else
 #include <malloc.h>
--- a/threadutil/src/ThreadPool.c
+++ b/threadutil/src/ThreadPool.c
@@ -90,14 +90,21 @@ FreeThreadPoolJob( ThreadPool * tp,
 static int
 SetPolicyType( PolicyType in )
 {
+    #ifdef __CYGWIN__
+     /* TODO not currently working... */
+     return 0;
+    #else
    #ifdef WIN32
     return sched_setscheduler( 0, in);
-    #else
+    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
     struct sched_param current;

     sched_getparam( 0, &current );
     current.sched_priority = DEFAULT_SCHED_PARAM;
     return sched_setscheduler( 0, in, &current );
+    #else
+     return 0;
+    #endif
    #endif
 }

@@ -118,7 +125,7 @@ SetPolicyType( PolicyType in )
 static int
 SetPriority( ThreadPriority priority )
 {
-
+#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
    int currentPolicy;
    int minPriority = 0;
    int maxPriority = 0;
@@ -126,7 +133,7 @@ SetPriority( ThreadPriority priority )
    int midPriority = 0;
    struct sched_param newPriority;

-    pthread_getschedparam( ithread_self(  ), &currentPolicy,
+    pthread_getschedparam( ithread_self(), &currentPolicy,
                           &newPriority );
    minPriority = sched_get_priority_min( currentPolicy );
    maxPriority = sched_get_priority_max( currentPolicy );
@@ -148,9 +155,11 @@ SetPriority( ThreadPriority priority )

    newPriority.sched_priority = actPriority;

-    return pthread_setschedparam( ithread_self(  ), currentPolicy,
+    return pthread_setschedparam( ithread_self(), currentPolicy,
                                  &newPriority );
-
+#else
+    return 0;
+#endif
 }

 /****************************************************************************
@@ -215,10 +224,8 @@ BumpPriority( ThreadPool * tp )
                //starvation time
                //bump priority (add to higher priority Q)

-                STATSONLY( tp->stats.totalJobsMQ++;
-                     );
-                STATSONLY( tp->stats.totalTimeMQ += diffTime;
-                     );
+                STATSONLY( tp->stats.totalJobsMQ++; )
+                STATSONLY( tp->stats.totalTimeMQ += diffTime; )

                ListDelNode( &tp->medJobQ, tp->medJobQ.head.next, 0 );
                ListAddTail( &tp->highJobQ, tempJob );
@@ -236,10 +243,8 @@ BumpPriority( ThreadPool * tp )
                //starvation time
                //bump priority (add to higher priority Q)

-                STATSONLY( tp->stats.totalJobsLQ++;
-                     );
-                STATSONLY( tp->stats.totalTimeLQ += diffTime;
-                     );
+                STATSONLY( tp->stats.totalJobsLQ++; )
+                STATSONLY( tp->stats.totalTimeLQ += diffTime; )

                ListDelNode( &tp->lowJobQ, tp->lowJobQ.head.next, 0 );
                ListAddTail( &tp->medJobQ, tempJob );
@@ -288,14 +293,26 @@ SetRelTimeout( struct timespec *time,
 *      ThreadPoolStats *stats must be valid non null stats structure
 *****************************************************************************/
 #ifdef STATS
-static void StatsInit( ThreadPoolStats * stats ) {
-           assert( stats != NULL ); stats->totalIdleTime = 0; stats->totalJobsHQ = 0; stats->totalJobsLQ = 0; stats->totalJobsMQ = 0; stats->totalTimeHQ = 0; stats->totalTimeMQ = 0; stats->totalTimeLQ = 0; stats->totalWorkTime = 0; stats->totalIdleTime = 0; stats->avgWaitHQ = 0; //average wait in HQ
-           stats->avgWaitMQ = 0;    //average wait in MQ
+static void StatsInit( ThreadPoolStats * stats )
+{
+           assert( stats != NULL );
+	   stats->totalIdleTime = 0;
+	   stats->totalJobsHQ = 0;
+	   stats->totalJobsLQ = 0;
+	   stats->totalJobsMQ = 0;
+	   stats->totalTimeHQ = 0;
+	   stats->totalTimeMQ = 0;
+	   stats->totalTimeLQ = 0;
+	   stats->totalWorkTime = 0;
+	   stats->totalIdleTime = 0;
+	   stats->avgWaitHQ = 0;
+           stats->avgWaitMQ = 0;
           stats->avgWaitLQ = 0;
           stats->workerThreads = 0;
           stats->idleThreads = 0;
           stats->persistentThreads = 0;
-           stats->maxThreads = 0; stats->totalThreads = 0;}
+           stats->maxThreads = 0; stats->totalThreads = 0;
+}
 #endif

 /****************************************************************************
@@ -341,18 +358,25 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
 *  Parameters:
 *      
 *****************************************************************************/
-    static void SetSeed(  ) {
-    struct timeb t;
+static void SetSeed() {
+	struct timeb t;

-    ftime( &t );
+	ftime( &t );
 #if defined(WIN32)
-    srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id(  ).p );
+	srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id().p );
 #elif defined(__FreeBSD__)
-    srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id(  ) );
+	srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id() );
+#elif defined(__linux__)
+	srand( ( unsigned int )t.millitm + ithread_get_current_thread_id() );
 #else
-    srand( ( unsigned int )t.millitm + ithread_get_current_thread_id(  ) );
+	{
+		volatile union { volatile pthread_t tid; volatile unsigned i; } idu;
+
+		idu.tid = ithread_get_current_thread_id();
+		srand( ( unsigned int )t.millitm + idu.i );
+	}
 #endif
-    }
+}

 /****************************************************************************
 * Function: WorkerThread
@@ -370,8 +394,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
 *****************************************************************************/
    static void *WorkerThread( void *arg ) {

-        STATSONLY( time_t start = 0;
-             )
+        STATSONLY( time_t start = 0; )

        ThreadPoolJob *job = NULL;
        ListNode *head = NULL;
@@ -395,10 +418,9 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
        ithread_cond_broadcast( &tp->start_and_shutdown );
        ithread_mutex_unlock( &tp->mutex );

-        SetSeed(  );
+        SetSeed();

-        STATSONLY( time( &start );
-             );
+        STATSONLY( time( &start ); )

        while( 1 ) {

@@ -413,12 +435,9 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:

            retCode = 0;

-            STATSONLY( tp->stats.idleThreads++;
-                 );
-            STATSONLY( tp->stats.totalWorkTime += ( time( NULL ) - start );
-                 );             //work time
-            STATSONLY( time( &start );
-                 );             //idle time
+            STATSONLY( tp->stats.idleThreads++; )
+            STATSONLY( tp->stats.totalWorkTime += ( time( NULL ) - start ); ) //work time
+            STATSONLY( time( &start ); )  // idle time

            if( persistent == 1 ) {
                //Persistent thread
@@ -426,8 +445,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
                tp->persistentThreads--;
            }

-            STATSONLY( if( persistent == 0 )
-                       tp->stats.workerThreads--; );
+            STATSONLY( if( persistent == 0 ) tp->stats.workerThreads--; )

            //Check for a job or shutdown
            while( ( tp->lowJobQ.size == 0 )
@@ -448,7 +466,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
                         && ( ( tp->totalThreads ) >
                              tp->attr.maxThreads ) ) ) {

-                    STATSONLY( tp->stats.idleThreads-- );
+                    STATSONLY( tp->stats.idleThreads--; )

                    tp->totalThreads--;
                    ithread_cond_broadcast( &tp->start_and_shutdown );
@@ -470,12 +488,9 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:

            }

-            STATSONLY( tp->stats.idleThreads--;
-                 );
-            STATSONLY( tp->stats.totalIdleTime += ( time( NULL ) - start );
-                 );             //idle time
-            STATSONLY( time( &start );
-                 );             //work time
+            STATSONLY( tp->stats.idleThreads--; )
+            STATSONLY( tp->stats.totalIdleTime += ( time( NULL ) - start ); )  // idle time
+            STATSONLY( time( &start ); ) // work time

            //bump priority of starved jobs
            BumpPriority( tp );
@@ -507,34 +522,33 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
                    ithread_cond_broadcast( &tp->start_and_shutdown );

                } else {
-                    STATSONLY( tp->stats.workerThreads++ );
+                    STATSONLY( tp->stats.workerThreads++; )
                    persistent = 0;

                    //Pick the highest priority job
                    if( tp->highJobQ.size > 0 ) {
                        head = ListHead( &tp->highJobQ );
                        job = ( ThreadPoolJob * ) head->item;
-                        STATSONLY( CalcWaitTime
-                                   ( tp, HIGH_PRIORITY, job ) );
+                        STATSONLY( CalcWaitTime( tp, HIGH_PRIORITY, job ); )
                        ListDelNode( &tp->highJobQ, head, 0 );

                    } else if( tp->medJobQ.size > 0 ) {
                        head = ListHead( &tp->medJobQ );
                        job = ( ThreadPoolJob * ) head->item;
-                        STATSONLY( CalcWaitTime( tp, MED_PRIORITY, job ) );
+                        STATSONLY( CalcWaitTime( tp, MED_PRIORITY, job ); )
                        ListDelNode( &tp->medJobQ, head, 0 );

                    } else if( tp->lowJobQ.size > 0 ) {
                        head = ListHead( &tp->lowJobQ );
                        job = ( ThreadPoolJob * ) head->item;
-                        STATSONLY( CalcWaitTime( tp, LOW_PRIORITY, job ) );
+                        STATSONLY( CalcWaitTime( tp, LOW_PRIORITY, job ); )
                        ListDelNode( &tp->lowJobQ, head, 0 );

                    } else {

                        // Should never get here
                        assert( 0 );
-                        STATSONLY( tp->stats.workerThreads-- );
+                        STATSONLY( tp->stats.workerThreads--; )
                        tp->totalThreads--;
                        ithread_cond_broadcast( &tp->start_and_shutdown );
                        ithread_mutex_unlock( &tp->mutex );
@@ -639,9 +653,11 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:

        }

-        STATSONLY( if( tp->stats.maxThreads < tp->totalThreads ) {
-                   tp->stats.maxThreads = tp->totalThreads;}
-         )
+#ifdef STATS
+        if( tp->stats.maxThreads < tp->totalThreads ) {
+                   tp->stats.maxThreads = tp->totalThreads;
+        }
+#endif

            return rc;
    }
@@ -669,7 +685,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
        threads = tp->totalThreads - tp->persistentThreads;

        while( ( threads == 0 )
-               || ( ( jobs / threads ) > tp->attr.jobsPerThread ) ) {
+               || ( ( jobs / threads ) >= tp->attr.jobsPerThread ) ) {

            if( CreateWorker( tp ) != 0 )
                return;
@@ -761,7 +777,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
                                 JOBFREELISTSIZE );
        assert( retCode == 0 );

-        STATSONLY( StatsInit( &tp->stats ) );
+        STATSONLY( StatsInit( &tp->stats ); )

        retCode += ListInit( &tp->highJobQ, CmpThreadPoolJob, NULL );
        assert( retCode == 0 );
--- a/threadutil/src/iasnprintf.c
+++ b/threadutil/src/iasnprintf.c
@@ -31,7 +31,8 @@

 #include <stdarg.h>
 #include <assert.h>
-#ifdef __FreeBSD__
+#include <sys/param.h>
+#if (defined(BSD) && BSD >= 199306)
 #include <stdlib.h>
 #else
 #include <malloc.h>
--- a/upnp/Makefile.am
+++ b/upnp/Makefile.am
@@ -1,163 +1,153 @@
-# $Id: Makefile.am,v 1.10 2006/04/08 15:22:22 r3mi Exp $
 #
 # "Makefile.am" for "libupnp/upnp"
 #
 # Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #

-SUBDIRS 		= doc
+SUBDIRS = doc . sample

-AM_CPPFLAGS		= -I$(srcdir)/inc \
-			  -I$(top_srcdir)/threadutil/inc \
-			  -I$(top_srcdir)/ixml/inc
+AM_CPPFLAGS = \
+	-I$(srcdir)/inc \
+	-I$(top_srcdir)/threadutil/inc \
+	-I$(top_srcdir)/ixml/inc

-AM_CFLAGS		= $(PTHREAD_CFLAGS)
+AM_CFLAGS = $(PTHREAD_CFLAGS)

-AM_LDFLAGS		= $(PTHREAD_LIBS)
+AM_LDFLAGS = $(PTHREAD_LIBS)

-LDADD			= libupnp.la \
-			  $(top_builddir)/threadutil/libthreadutil.la \
-			  $(top_builddir)/ixml/libixml.la
+LDADD = \
+	libupnp.la \
+	$(top_builddir)/threadutil/libthreadutil.la \
+	$(top_builddir)/ixml/libixml.la


-upnpincludedir          = $(includedir)/upnp
-upnpinclude_HEADERS     = inc/upnp.h 
+upnpincludedir = $(includedir)/upnp
+upnpinclude_HEADERS = \
+	inc/upnp.h \
+	inc/upnpdebug.h
+
 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
-upnpinclude_HEADERS	+= inc/upnptools.h 
-endif
-if ENABLE_DEBUG
-upnpinclude_HEADERS	+= inc/upnpdebug.h
+upnpinclude_HEADERS += inc/upnptools.h 
 endif

-lib_LTLIBRARIES		= libupnp.la

-libupnp_la_CPPFLAGS	= $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
-libupnp_la_LDFLAGS	= -version-info $(LT_VERSION_UPNP) \
-			  -export-symbols-regex '^Upnp.*' \
-			  $(top_builddir)/threadutil/libthreadutil.la \
-			  $(top_builddir)/ixml/libixml.la
+lib_LTLIBRARIES = libupnp.la

-libupnp_la_SOURCES	= \
-			src/inc/config.h \
-			src/inc/client_table.h src/inc/global.h \
-			src/inc/md5.h src/inc/ssdplib.h \
-			src/inc/unixutil.h src/inc/urlconfig.h \
-			src/inc/gmtdate.h src/inc/membuffer.h \
-			src/inc/server.h src/inc/statcodes.h \
-			src/inc/upnpapi.h src/inc/utilall.h \
-			src/inc/gena_ctrlpt.h src/inc/http_client.h \
-			src/inc/miniserver.h src/inc/service_table.h \
-			src/inc/statuscodes.h src/inc/upnpclosesocket.h \
-			src/inc/util.h src/inc/gena_device.h \
-			src/inc/httpparser.h src/inc/netall.h \
-			src/inc/soaplib.h src/inc/strintmap.h \
-			src/inc/upnp_timeout.h src/inc/uuid.h \
-			src/inc/gena.h src/inc/httpreadwrite.h \
-			src/inc/parsetools.h src/inc/sock.h \
-			src/inc/sysdep.h src/inc/uri.h \
-			src/inc/webserver.h
+libupnp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
+
+libupnp_la_LDFLAGS = \
+	-version-info $(LT_VERSION_UPNP) \
+	-export-symbols-regex '^Upnp.*' \
+	$(top_builddir)/threadutil/libthreadutil.la \
+	$(top_builddir)/ixml/libixml.la
+
+libupnp_la_SOURCES = \
+	src/inc/config.h \
+	src/inc/client_table.h \
+	src/inc/gena.h \
+	src/inc/gena_ctrlpt.h \
+	src/inc/gena_device.h \
+	src/inc/global.h \
+	src/inc/gmtdate.h \
+	src/inc/http_client.h \
+	src/inc/httpparser.h \
+	src/inc/httpreadwrite.h \
+	src/inc/md5.h \
+	src/inc/membuffer.h \
+	src/inc/miniserver.h \
+	src/inc/netall.h \
+	src/inc/parsetools.h \
+	src/inc/server.h \
+	src/inc/service_table.h \
+	src/inc/soaplib.h \
+	src/inc/sock.h \
+	src/inc/statcodes.h \
+	src/inc/statuscodes.h \
+	src/inc/strintmap.h \
+	src/inc/ssdplib.h \
+	src/inc/sysdep.h \
+	src/inc/unixutil.h \
+	src/inc/upnpapi.h \
+	src/inc/upnpclosesocket.h \
+	src/inc/upnp_timeout.h \
+	src/inc/uri.h \
+	src/inc/urlconfig.h \
+	src/inc/util.h \
+	src/inc/utilall.h \
+	src/inc/uuid.h \
+	src/inc/webserver.h

 # ssdp
-libupnp_la_SOURCES	+= src/ssdp/ssdp_device.c src/ssdp/ssdp_ctrlpt.c \
-			src/ssdp/ssdp_server.c
+libupnp_la_SOURCES += \
+	src/ssdp/ssdp_device.c \
+	src/ssdp/ssdp_ctrlpt.c \
+	src/ssdp/ssdp_server.c

 # soap
-libupnp_la_SOURCES	+= src/soap/soap_device.c src/soap/soap_ctrlpt.c \
-			src/soap/soap_common.c
+libupnp_la_SOURCES += \
+	src/soap/soap_device.c \
+	src/soap/soap_ctrlpt.c \
+	src/soap/soap_common.c

 # genlib
-libupnp_la_SOURCES	+= \
-			src/genlib/miniserver/miniserver.c \
-			src/genlib/service_table/service_table.c \
-			src/genlib/util/membuffer.c \
-			src/genlib/util/strintmap.c \
-			src/genlib/util/upnp_timeout.c \
-			src/genlib/util/util.c \
-			src/genlib/client_table/client_table.c \
-			src/genlib/net/sock.c \
-			src/genlib/net/http/httpparser.c \
-			src/genlib/net/http/httpreadwrite.c \
-			src/genlib/net/http/statcodes.c \
-			src/genlib/net/http/webserver.c \
-			src/genlib/net/http/parsetools.c \
-			src/genlib/net/uri/uri.c
+libupnp_la_SOURCES += \
+	src/genlib/miniserver/miniserver.c \
+	src/genlib/service_table/service_table.c \
+	src/genlib/util/membuffer.c \
+	src/genlib/util/strintmap.c \
+	src/genlib/util/upnp_timeout.c \
+	src/genlib/util/util.c \
+	src/genlib/client_table/client_table.c \
+	src/genlib/net/sock.c \
+	src/genlib/net/http/httpparser.c \
+	src/genlib/net/http/httpreadwrite.c \
+	src/genlib/net/http/statcodes.c \
+	src/genlib/net/http/webserver.c \
+	src/genlib/net/http/parsetools.c \
+	src/genlib/net/uri/uri.c

 # gena
-libupnp_la_SOURCES	+= src/gena/gena_device.c src/gena/gena_ctrlpt.c \
-			src/gena/gena_callback2.c
+libupnp_la_SOURCES += \
+	src/gena/gena_device.c \
+	src/gena/gena_ctrlpt.c \
+	src/gena/gena_callback2.c

 # api
-libupnp_la_SOURCES	+= src/api/upnpapi.c
+libupnp_la_SOURCES += src/api/upnpapi.c
 if ENABLE_TOOLS
-    libupnp_la_SOURCES	+= src/api/upnptools.c
+libupnp_la_SOURCES += src/api/upnptools.c
 endif
 if ENABLE_DEBUG
-    libupnp_la_SOURCES	+= src/api/upnpdebug.c 
+libupnp_la_SOURCES += src/api/upnpdebug.c 
 endif

+
 # uuid
-libupnp_la_SOURCES	+= src/uuid/md5.c src/uuid/sysdep.c src/uuid/uuid.c
+libupnp_la_SOURCES += \
+	src/uuid/md5.c \
+	src/uuid/sysdep.c \
+	src/uuid/uuid.c
+

 # urlconfig
-libupnp_la_SOURCES	+= src/urlconfig/urlconfig.c
-
-
-# samples
-noinst_PROGRAMS		=
-if ENABLE_SAMPLES
-if ENABLE_CLIENT
-    noinst_PROGRAMS	+= upnp_tv_ctrlpt
-    upnp_tv_ctrlpt_CPPFLAGS = $(AM_CPPFLAGS) \
-			-I$(srcdir)/sample/common/ \
-			-I$(srcdir)/sample/tvctrlpt
-endif
-if ENABLE_DEVICE
-    noinst_PROGRAMS	+= upnp_tv_device 
-    upnp_tv_device_CPPFLAGS = $(AM_CPPFLAGS) \
-			-I$(srcdir)/sample/common/ \
-			-I$(srcdir)/sample/tvdevice
-endif
-endif
-upnp_tv_device_SOURCES = \
-			sample/common/sample_util.c \
-			sample/common/sample_util.h \
-			sample/tvdevice/upnp_tv_device.c \
-			sample/tvdevice/upnp_tv_device.h \
-			sample/tvdevice/linux/upnp_tv_device_main.c
-upnp_tv_ctrlpt_SOURCES = \
-			sample/common/sample_util.c \
-			sample/common/sample_util.h \
-			sample/tvctrlpt/upnp_tv_ctrlpt.c \
-			sample/tvctrlpt/upnp_tv_ctrlpt.h \
-			sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
-
-if WITH_DOCUMENTATION
-    examplesdir 	= $(docdir)/examples
-    examples_DATA 	= $(upnp_tv_ctrlpt_SOURCES) $(upnp_tv_device_SOURCES)
-endif
+libupnp_la_SOURCES += src/urlconfig/urlconfig.c


 # check / distcheck tests
-check_PROGRAMS		= test_init
-TESTS			= test_init
-
-test_init_SOURCES	= test/test_init.c
+check_PROGRAMS = test_init
+TESTS = test_init
+test_init_SOURCES = test/test_init.c


-EXTRA_DIST 		= LICENSE \
-			sample/tvdevice/web/tvcontrolSCPD.xml \
-			sample/tvdevice/web/tvdevicedesc.xml \
-			sample/tvdevice/web/tvdevicepres.html \
-			sample/tvdevice/web/tvpictureSCPD.xml \
-			src/inc/inet_pton.h \
-			src/inet_pton.c \
-			src/win_dll.c
-
-
-
-CLEANFILES		= IUpnpErrFile.txt IUpnpInfoFile.txt
-
+EXTRA_DIST = \
+	LICENSE \
+	src/inc/inet_pton.h \
+	src/inet_pton.c \
+	src/win_dll.c


+CLEANFILES = \
+	IUpnpErrFile.txt \
+	IUpnpInfoFile.txt

--- a/upnp/inc/upnp.h
+++ b/upnp/inc/upnp.h
@@ -1,95 +1,125 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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_H
 #define UPNP_H

 /** @name The API */

-//@{
+/*! @{ */
+

 #if defined MYLIB_LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 != 64
-  #if defined __GNUC__
-   #warning libupnp requires largefile mode - use AC_SYS_LARGEFILE
-  #else
-   #error  libupnp requires largefile mode - use AC_SYS_LARGEFILE
-  #endif
+	#if defined __GNUC__
+		#warning libupnp requires largefile mode - use AC_SYS_LARGEFILE
+	#else
+		#error  libupnp requires largefile mode - use AC_SYS_LARGEFILE
+	#endif
 #endif 

+
 #include <stdio.h>
-#ifdef __FreeBSD__
-#include <time.h>
+#include <sys/param.h>
+#if (defined(BSD) && BSD >= 199306)
+	#include <time.h>
 #endif
 #include "ixml.h"
 #include "upnpconfig.h"
-#if UPNP_HAVE_DEBUG
-#	include "upnpdebug.h"
-#endif
+

 #ifdef WIN32
- #ifndef UPNP_STATIC_LIB
-  #ifdef LIBUPNP_EXPORTS
-   // set up declspec for dll export to make functions visible to library users
-   #define EXPORT_SPEC __declspec(dllexport)
-  #else
-   #define EXPORT_SPEC __declspec(dllimport)
-  #endif
- #else
-  #define EXPORT_SPEC
- #endif
+	#ifndef UPNP_STATIC_LIB
+		#ifdef LIBUPNP_EXPORTS
+			/* set up declspec for dll export to make functions visible to library users */
+			#define EXPORT_SPEC __declspec(dllexport)
+		#else
+			#define EXPORT_SPEC __declspec(dllimport)
+		#endif
+	#else
+		#define EXPORT_SPEC
+	#endif
+	#ifdef UPNP_USE_MSVCPP
+		/* define some things the M$ VC++ doesn't know */
+		#define UPNP_INLINE
+		typedef __int64 int64_t;
+		#define PRId64 "I64d"
+		#define PRIzu "lu"
+	#endif
+	#ifdef UPNP_USE_BCBPP
+		/* define some things Borland Builder doesn't know */
+		#define UPNP_INLINE inline
+		typedef __int64 int64_t;
+#warning The Borland C compiler is probably broken on PRId64, please someone provide a proper fix here
+		#define PRId64 "I64d"
+		#define PRIzu "zu"
+	#endif
 #else
- #define EXPORT_SPEC
+	#define EXPORT_SPEC
+	#define UPNP_INLINE inline
+	/* Invented this macro so that we can live a little longer with MSVC lack of C99. */
+	#define PRIzu "zu"
 #endif

-#ifndef WIN32
- #define UpnpCloseSocket         close
-#else
- #define UpnpCloseSocket         closesocket
- #define fseeko fseek
-#endif
-#define UPNP_SOCKETERROR        -1
-#define UPNP_INVALID_SOCKET     -1
-#ifndef WIN32
- #define SOCKET                  int
-#endif
+/*
+ * Defining this macro here gives some interesting information about unused
+ * functions in the code. Of course, this should never go uncommented on a
+ * release.
+ */
+/*#define inline*/
+

 #ifndef WIN32
- #include <netinet/in.h>
+	#define UpnpCloseSocket close
 #else
- #include <winsock2.h>
- #include <time.h>
+	#define UpnpCloseSocket closesocket
+	#define fseeko fseek
 #endif
+#define UPNP_SOCKETERROR -1
+#define UPNP_INVALID_SOCKET -1
+#ifndef WIN32
+	#define SOCKET int
+#endif
+
+
+#ifndef WIN32
+	#include <netinet/in.h>
+#else
+	#include <winsock2.h>
+	#include <time.h>
+#endif
+

 #include <sys/types.h>

+
 #define NUM_HANDLE 200
 #define LINE_SIZE  180
 #define NAME_SIZE  256
@@ -98,7 +128,6 @@
 #define SERL_NUMR_SIZE  64
 #define MODL_DESC_SIZE  64
 #define UPNP_INFINITE -1
-
 #define UPNP_USING_CHUNKED			-3
 #define UPNP_UNTIL_CLOSE			-4

@@ -110,7 +139,7 @@
 *  code means.  Refer to the documentation for each function for a 
 *  description of what an error code means in that context.
 */
-//@{
+/*! @{ */

 /** @name UPNP_E_SUCCESS [0]
 *  {\tt UPNP_E_SUCCESS} signifies that the operation completed successfully.
@@ -118,35 +147,35 @@
 *  the operation was successfully transmitted on the network.  The result of 
 *  the entire operation comes as part of the callback for that operation.
 */
-//@{
+/*! @{ */
 #define UPNP_E_SUCCESS          0
-//@}
+/*! @} */

 /** @name UPNP_E_INVALID_HANDLE [-100]
 *  {\tt UPNP_E_INVALID_HANDLE} signifies that the handle passed to a 
 *  function is not a recognized as a valid handle.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INVALID_HANDLE   -100
-//@}
+/*! @} */

 /** @name UPNP_E_INVALID_PARAM [-101]
 *  {\tt UPNP_E_INVALID_PARAM} signifies that one or more of the parameters 
 *  passed to the function is not valid.  Refer to the documentation for each 
 *  function for more information on the valid ranges of the parameters.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INVALID_PARAM    -101
-//@}
+/*! @} */

 /** @name UPNP_E_OUTOF_HANDLE [-102]
 *  {\tt UPNP_E_OUTOF_HANDLE} signifies that the SDK does not have any
 *  more space for additional handles.  The SDK allocates space for only 
 *  a few handles in order to conserve memory.
 */
-//@{
+/*! @{ */
 #define UPNP_E_OUTOF_HANDLE     -102
-//@}
+/*! @} */

 #define UPNP_E_OUTOF_CONTEXT    -103

@@ -155,9 +184,9 @@
 *  currently available to complete the operation.  Most operations require 
 *  some free memory in order to complete their work.
 */
-//@{
+/*! @{ */
 #define UPNP_E_OUTOF_MEMORY     -104
-//@}
+/*! @} */

 /** @name UPNP_E_INIT [-105]
 *  {\tt UPNP_E_INIT} signifies that the SDK has already been 
@@ -165,9 +194,9 @@
 *  Any additional initialization attempts simply return this error with
 *  no other ill effects.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INIT             -105
-//@}
+/*! @} */

 #define UPNP_E_BUFFER_TOO_SMALL -106

@@ -176,9 +205,9 @@
 *  to {\bf UpnpRegisterRootDevice} or {\bf UpnpRegisterRootDevice2} is an 
 *  invalid description document.  
 */
-//@{
+/*! @{ */
 #define UPNP_E_INVALID_DESC     -107
-//@}
+/*! @} */

 /** @name UPNP_E_INVALID_URL [-108]
 *  {\tt UPNP_E_INVALID_URL} signifies that a URL passed into the function
@@ -186,9 +215,9 @@
 *  URL itself might be malformed (e.g. have invalid characters in it) or
 *  the host might be unreachable.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INVALID_URL      -108
-//@}
+/*! @} */

 #define UPNP_E_INVALID_SID      -109
 #define UPNP_E_INVALID_DEVICE   -110
@@ -199,18 +228,18 @@
 *  {\bf UpnpAcceptSubscriptionExt} to signify that the device ID/service
 *  ID pair does not refer to a valid service.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INVALID_SERVICE  -111
-//@}
+/*! @} */

 /** @name UPNP_E_BAD_RESPONSE [-113]
 *  {\tt UPNP_E_BAD_RESPONSE} signifies that the response received from the 
 *  remote side of a connection is not correct for the protocol.  This applies
 *  to the GENA, SOAP, and HTTP protocols.
 */
-//@{
+/*! @{ */
 #define UPNP_E_BAD_RESPONSE     -113
-//@}
+/*! @} */

 #define UPNP_E_BAD_REQUEST      -114

@@ -219,26 +248,26 @@
 *  invalid.  This can be because the DOM document passed to the function was
 *  malformed or the action message is not correct for the given action.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INVALID_ACTION   -115
-//@}
+/*! @} */

 /** @name UPNP_E_FINISH [-116]
 *  {\tt UPNP_E_FINISH} signifies that {\bf UpnpInit} has not been called, or
 *  that {\bf UpnpFinish} has already been called.  None of the API functions 
 *  operate until {\bf UpnpInit} successfully completes.
 */
-//@{
+/*! @{ */
 #define UPNP_E_FINISH           -116
-//@}
+/*! @} */

 /** @name UPNP_E_INIT_FAILED [-117]
 *  {\tt UPNP_E_INIT_FAILED} signifies that {\bf UpnpInit} cannot complete.  
 *  The typical reason is failure to allocate sufficient resources.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INIT_FAILED      -117
-//@}
+/*! @} */

 /** @name UPNP_E_URL_TOO_BIG [-118]
 *  {\tt UPNP_E_URL_TOO_BIG} signifies that the URL passed into a function 
@@ -254,18 +283,18 @@
 *  message (e.g. {\bf UpnpSubscribe}), GENA event notifications (e.g. {\bf
 *  UpnpNotify}), and HTTP transfers (e.g. {\bf UpnpDownloadXmlDoc}).
 */
-//@{
+/*! @{ */
 #define UPNP_E_BAD_HTTPMSG      -119
-//@}
+/*! @} */

 /** @name UPNP_E_ALREADY_REGISTERED [-120]
 *  {\tt UPNP_E_ALREADY_REGISTERED} signifies that a client or a device is
 *  already registered.  The SDK currently has a limit of one registered 
 *  client and one registered device per process.
 */
-//@{
+/*! @{ */
 #define UPNP_E_ALREADY_REGISTERED -120
-//@}
+/*! @} */

 /** @name UPNP_E_NETWORK_ERROR [-200]
 *  {\tt UPNP_E_NETWORK_ERROR} signifies that a network error occurred.  It 
@@ -274,9 +303,9 @@
 *  failed to read the local IP address or had problems configuring one of
 *  the sockets.
 */
-//@{
+/*! @{ */
 #define UPNP_E_NETWORK_ERROR    -200
-//@}
+/*! @} */

 /** @name UPNP_E_SOCKET_WRITE [-201]
 *  {\tt UPNP_E_SOCKET_WRITE} signifies an error writing to a socket.  This
@@ -285,9 +314,9 @@
 *  control (e.g. {\bf UpnpSendAction}), eventing (e.g. {\bf UpnpNotify}), 
 *  and HTTP functions (e.g. {\bf UpnpDownloadXmlDoc}).
 */
-//@{
+/*! @{ */
 #define UPNP_E_SOCKET_WRITE     -201
-//@}
+/*! @} */

 /** @name UPNP_E_SOCKET_READ [-202]
 *  {\tt UPNP_E_SOCKET_READ} signifies an error reading from a socket.  This
@@ -296,9 +325,9 @@
 *  control (e.g. {\bf UpnpSendAction}), eventing (e.g. {\bf UpnpNotify}), 
 *  and HTTP functions (e.g. {\bf UpnpDownloadXmlDoc}).
 */
-//@{
+/*! @{ */
 #define UPNP_E_SOCKET_READ      -202
-//@}
+/*! @} */

 /** @name UPNP_E_SOCKET_BIND [-203]
 *  {\tt UPNP_E_SOCKET_BIND} signifies that the SDK had a problem binding
@@ -308,9 +337,9 @@
 *  (e.g. {\bf UpnpNotify}), and HTTP functions (e.g. 
 *  {\bf UpnpDownloadXmlDoc}).
 */
-//@{
+/*! @{ */
 #define UPNP_E_SOCKET_BIND      -203
-//@}
+/*! @} */

 /** @name UPNP_E_SOCKET_CONNECT [-204]
 *  {\tt UPNP_E_SOCKET_CONNECT} signifies that the SDK had a problem
@@ -320,9 +349,9 @@
 *  (e.g. {\bf UpnpNotify}), and HTTP functions (e.g. 
 *  {\bf UpnpDownloadXmlDoc}).
 */
-//@{
+/*! @{ */
 #define UPNP_E_SOCKET_CONNECT   -204
-//@}
+/*! @} */

 /** @name UPNP_E_OUTOF_SOCKET [-205]
 *  {\tt UPNP_E_OUTOF_SOCKET} signifies that the SDK cannot create any
@@ -332,36 +361,36 @@
 *  (e.g. {\bf UpnpNotify}), and HTTP functions (e.g. 
 *  {\bf UpnpDownloadXmlDoc}).
 */
-//@{
+/*! @{ */
 #define UPNP_E_OUTOF_SOCKET     -205
-//@}
+/*! @} */

 /** @name UPNP_E_LISTEN [-206]
 *  {\tt UPNP_E_LISTEN} signifies that the SDK had a problem setting the
 *  socket to listen for incoming connections.  This error only happens during
 *  initialization (i.e. {\bf UpnpInit}).
 */
-//@{
+/*! @{ */
 #define UPNP_E_LISTEN           -206
-//@}
+/*! @} */

 /** @name UPNP_E_TIMEDOUT [-207]
 *  {\tt UPNP_E_TIMEDOUT} signifies that too much time elapsed before the
 *  required number of bytes were sent or received over a socket.  This error
 *  can be returned by any function that performs network operations.
 */
-//@{
+/*! @{ */
 #define UPNP_E_TIMEDOUT         -207
-//@}
+/*! @} */

 /** @name UPNP_E_SOCKET_ERROR [-208]
 *  {\tt UPNP_E_SOCKET_ERROR} is the generic socket error code for
 *  conditions not covered by other error codes.  This error can be returned
 *  by any function that performs network operations.
 */
-//@{
+/*! @{ */
 #define UPNP_E_SOCKET_ERROR	    -208
-//@}
+/*! @} */

 #define UPNP_E_FILE_WRITE_ERROR -209

@@ -370,9 +399,9 @@
 *  error can be returned by any function that allows for external
 *  cancelation.
 */
-//@{
+/*! @{ */
 #define UPNP_E_CANCELED         -210
-//@}
+/*! @} */

 #define UPNP_E_EVENT_PROTOCOL         -300

@@ -380,58 +409,58 @@
 *  {\tt UPNP_E_SUBSCRIBE_UNACCEPTED} signifies that a subscription
 *  request was rejected from the remote side.  
 */
-//@{
+/*! @{ */
 #define UPNP_E_SUBSCRIBE_UNACCEPTED   -301
-//@}
+/*! @} */

 /** @name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302]
 *  {\tt UPNP_E_UNSUBSCRIBE_UNACCEPTED} signifies that an unsubscribe
 *  request was rejected from the remote side.
 */
-//@{
+/*! @{ */
 #define UPNP_E_UNSUBSCRIBE_UNACCEPTED -302
-//@}
+/*! @} */

 /** @name UPNP_E_NOTIFY_UNACCEPTED [-303]
 *  {\tt UPNP_E_NOTIFY_UNACCEPTED} signifies that the remote host did not
 *  accept the notify sent from the local device.
 */
-//@{
+/*! @{ */
 #define UPNP_E_NOTIFY_UNACCEPTED      -303
-//@}
+/*! @} */

 /** @name UPNP_E_INVALID_ARGUMENT [-501]
 *  {\tt UPNP_E_INVALID_ARGUMENT} signifies that one or more of the parameters
 *  passed to a function is invalid.  Refer to the individual function
 *  descriptions for the acceptable ranges for parameters.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INVALID_ARGUMENT       -501
-//@}
+/*! @} */

 /** @name UPNP_E_FILE_NOT_FOUND [-502]
 *  {\tt UPNP_E_FILE_NOT_FOUND} signifies that the filename passed
 *  to one of the device registration functions was not found or was not
 *  accessible.
 */
-//@{
+/*! @{ */
 #define UPNP_E_FILE_NOT_FOUND         -502
-//@}
+/*! @} */

 /** @name UPNP_E_FILE_READ_ERROR [-503]
 *  {\tt UPNP_E_FILE_READ_ERROR} signifies an error when reading a file.
 */
-//@{
+/*! @{ */
 #define UPNP_E_FILE_READ_ERROR        -503
-//@}
+/*! @} */

 /** @name UPNP_E_EXT_NOT_XML [-504]
 *  {\tt UPNP_E_EXT_NOT_XML} signifies that the file name of the description
 *  document passed to {\bf UpnpRegisterRootDevice2} does not end in ".xml".
 */
-//@{
+/*! @{ */
 #define UPNP_E_EXT_NOT_XML            -504
-//@}
+/*! @} */

 #define UPNP_E_NO_WEB_SERVER          -505
 #define UPNP_E_OUTOF_BOUNDS	      -506
@@ -440,26 +469,26 @@
 *  {\tt UPNP_E_NOT_FOUND} signifies that the response to a SOAP request
 *  did not contain the required XML constructs.  
 */
-//@{
+/*! @{ */
 #define UPNP_E_NOT_FOUND	      -507
-//@}
+/*! @} */

 /** @name UPNP_E_INTERNAL_ERROR [-911]
 *  {\tt UPNP_E_INTERNAL_ERROR} is the generic error code for internal
 *  conditions not covered by other error codes.
 */
-//@{
+/*! @{ */
 #define UPNP_E_INTERNAL_ERROR         -911
-//@}
+/*! @} */

-// SOAP-related error codes
+/* SOAP-related error codes */
 #define UPNP_SOAP_E_INVALID_ACTION    401
 #define UPNP_SOAP_E_INVALID_ARGS      402
 #define UPNP_SOAP_E_OUT_OF_SYNC       403
 #define UPNP_SOAP_E_INVALID_VAR       404
 #define UPNP_SOAP_E_ACTION_FAILED     501

-//@}
+/*! @} */

 #ifndef OUT
 #define OUT
@@ -473,10 +502,12 @@
 #define INOUT
 #endif

+#include "upnpdebug.h"
+
 enum UpnpOpenFileMode{UPNP_READ, UPNP_WRITE};

-/// @name Constants, Structures, and Types
-//@{
+/*! @name Constants, Structures, and Types */
+/*! @{ */

 /** Returned when a control point application registers with {\bf
 *  UpnpRegisterClient}.  Client handles can only be used with 
@@ -499,9 +530,9 @@ typedef int  UpnpDevice_Handle;

 enum Upnp_EventType_e {

-  //
-  // Control callbacks
-  //
+  /*
+   * Control callbacks
+   */

  /** Received by a device when a control point issues a control
   *  request.  The {\bf Event} parameter contains a pointer to a {\bf
@@ -529,9 +560,9 @@ enum Upnp_EventType_e {

  UPNP_CONTROL_GET_VAR_COMPLETE,

-  //
-  // Discovery callbacks
-  //
+  /*
+   * Discovery callbacks
+   */

  /** Received by a control point when a new device or service is available.  
   *  The {\bf Event} parameter contains a pointer to a {\bf
@@ -560,9 +591,9 @@ enum Upnp_EventType_e {

  UPNP_DISCOVERY_SEARCH_TIMEOUT,

-  //
-  // Eventing callbacks
-  //
+  /*
+   * Eventing callbacks
+   */

  /** Received by a device when a subscription arrives.
   *  The {\bf Event} parameter contains a pointer to a {\bf
@@ -793,51 +824,47 @@ struct Upnp_Event

 };

-//
-// This typedef is required by Doc++ to parse the last entry of the 
-// Upnp_Discovery structure correctly.
-//
+/*
+ * This typedef is required by Doc++ to parse the last entry of the 
+ * Upnp_Discovery structure correctly.
+ */

-typedef struct sockaddr_in SOCKADDRIN;

 /** Returned in a {\bf UPNP_DISCOVERY_RESULT} callback. */
-
 struct Upnp_Discovery
 {
-
-  /** The result code of the {\bf UpnpSearchAsync} call. */
-  int  ErrCode;                  
+	/** The result code of the {\bf UpnpSearchAsync} call. */
+	int  ErrCode;                  
 				     
-  /** The expiration time of the advertisement. */
-  int  Expires;                  
-                                     
-  /** The unique device identifier. */
-  char DeviceId[LINE_SIZE];      
-
-  /** The device type. */
-  char DeviceType[LINE_SIZE];    
-
-  /** The service type. */
-  char ServiceType[LINE_SIZE];
-
-  /** The service version. */
-  char ServiceVer[LINE_SIZE];    
-
-  /** The URL to the UPnP description document for the device. */
-  char Location[LINE_SIZE];      
-
-  /** The operating system the device is running. */
-  char Os[LINE_SIZE];            
+	/** The expiration time of the advertisement. */
+	int  Expires;                  
 				     
-  /** Date when the response was generated. */
-  char Date[LINE_SIZE];            
-				     
-  /** Confirmation that the MAN header was understood by the device. */
-  char Ext[LINE_SIZE];           
-				     
-  /** The host address of the device responding to the search. */
-  SOCKADDRIN * DestAddr; 
+	/** The unique device identifier. */
+	char DeviceId[LINE_SIZE];      

+	/** The device type. */
+	char DeviceType[LINE_SIZE];    
+
+	/** The service type. */
+	char ServiceType[LINE_SIZE];
+
+	/** The service version. */
+	char ServiceVer[LINE_SIZE];    
+
+	/** The URL to the UPnP description document for the device. */
+	char Location[LINE_SIZE];      
+
+	/** The operating system the device is running. */
+	char Os[LINE_SIZE];            
+				     
+	/** Date when the response was generated. */
+	char Date[LINE_SIZE];            
+				     
+	/** Confirmation that the MAN header was understood by the device. */
+	char Ext[LINE_SIZE];           
+				     
+	/** The host address of the device responding to the search. */
+	struct sockaddr_in DestAddr; 
 };

 /** Returned along with a {\bf UPNP_EVENT_SUBSCRIBE_COMPLETE} or {\bf
@@ -1041,14 +1068,14 @@ typedef int  (*Upnp_FunPtr) (
    IN void *Cookie
    );

-//@} // Constants, Structures, and Types
+/*! @} */ /* Constants, Structures, and Types */

 #ifdef __cplusplus
 extern "C" {
-#endif // __cplusplus
+#endif /* __cplusplus */

-///@name Initialization and Registration
-//@{
+/*! @name Initialization and Registration */
+/*! @{ */
 /** Initializes the Linux SDK for UPnP Devices. This function must be called
 *  before any other API function can be called.  It should be called
 *  only once.  Subsequent calls to this API return a {\tt UPNP_E_INIT}
@@ -1359,18 +1386,18 @@ EXPORT_SPEC int UpnpSetMaxContentLength(
 			           for incoming SOAP actions, in bytes. */
    );

-//@} // Initialization and Registration
+/*! @} */ /* Initialization and Registration */

-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-//                                                                    //
-//                        D I S C O V E R Y                           //
-//                                                                    //
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ ******************************************************************************
+ *                                                                            *
+ *                        D I S C O V E R Y                                   *
+ *                                                                            *
+ ******************************************************************************
+ ******************************************************************************/

-///@name Discovery
-//@{
+/*! @name Discovery */
+/*! @{ */

 /** {\bf UpnpSearchAsync} searches for devices matching the given
 *  search target.  The function returns immediately and the SDK 
@@ -1429,18 +1456,18 @@ EXPORT_SPEC int UpnpSendAdvertisement(
                                  the announcements. */
    );

-//@} // Discovery
+/*! @} */ /* Discovery */

-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-//                                                                    //
-//                            C O N T R O L                           //
-//                                                                    //
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ ******************************************************************************
+ *                                                                            *
+ *                            C O N T R O L                                   *
+ *                                                                            *
+ ******************************************************************************
+ ******************************************************************************/

-///@name Control
-//@{
+/*! @name Control */
+/*! @{ */

 /** {\bf UpnpGetServiceVarStatus} queries the state of a state 
 *  variable of a service on another device.  This is a synchronous call.
@@ -1663,18 +1690,18 @@ EXPORT_SPEC int UpnpSendActionExAsync(
                                    passed to the callback when invoked. */
    );

-//@} // Control
+/*! @} */ /* Control */

-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-//                                                                    //
-//                        E V E N T I N G                             //
-//                                                                    //
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ ******************************************************************************
+ *                                                                            *
+ *                        E V E N T I N G                                     *
+ *                                                                            *
+ ******************************************************************************
+ ******************************************************************************/

-///@name Eventing
-//@{
+/*! @name Eventing */
+/*! @{ */

 /** {\bf UpnpAcceptSubscription} accepts a subscription request and sends
 *  out the current state of the eventable variables for a service.  
@@ -2177,19 +2204,19 @@ EXPORT_SPEC int UpnpUnSubscribeAsync(
                                  callback function when invoked. */
    );

-//@} // Eventing
+/*! @} */ /* Eventing */


-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-//                                                                    //
-//                        C L I E N T - A P I                         //
-//                                                                    //
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ ******************************************************************************
+ *                                                                            *
+ *                        C L I E N T - A P I                                 *
+ *                                                                            *
+ ******************************************************************************
+ ******************************************************************************/

-///@name Control Point HTTP API
-//@{
+/*! @name Control Point HTTP API */
+/*! @{ */

 /** {\bf UpnpDownloadUrlItem} downloads a file specified in a URL.
 *  The SDK allocates the memory for {\bf outBuf} and the 
@@ -2582,18 +2609,18 @@ EXPORT_SPEC int UpnpDownloadXmlDoc(
 				     XML document. */
    );

-//@} // Control Point HTTP API
+/*! @} */ /* Control Point HTTP API */

-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-//                                                                    //
-//                    W E B  S E R V E R  A P I                       //
-//                                                                    //
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ ******************************************************************************
+ *                                                                            *
+ *                    W E B  S E R V E R  A P I                               *
+ *                                                                            *
+ ******************************************************************************
+ ******************************************************************************/

-///@name Web Server API
-//@{
+/*! @name Web Server API */
+/*! @{ */

 /** {\bf UpnpSetWebServerRootDir} sets the document root directory for
 *  the internal web server. This directory is considered the
@@ -2709,12 +2736,13 @@ EXPORT_SPEC void UpnpFree(
    IN void *item /* The item to free. */
    );

-//@} // Web Server API
+/*! @} */ /* Web Server API */

 #ifdef __cplusplus
 }
-#endif // __cplusplus
+#endif /* __cplusplus */

-//@} The API
+/*! @} */ /* The API */

 #endif
+
--- a/upnp/inc/upnpconfig.h.in
+++ b/upnp/inc/upnpconfig.h.in
@@ -1,34 +1,34 @@
-// -*- C -*-
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
-// 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 <r3mi@users.sourceforge.net>
+ * 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 
@@ -91,6 +91,5 @@
 #undef UPNP_HAVE_TOOLS


-#endif // UPNP_CONFIG_H
-
+#endif /* UPNP_CONFIG_H */

--- a/upnp/inc/upnpdebug.h
+++ b/upnp/inc/upnpdebug.h
@@ -1,43 +1,41 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+ * 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_DEBUG_H
 #define UPNP_DEBUG_H 

+#include "upnp.h"
 #include "upnpconfig.h"

-// Function declarations only if debug compiled into the library
-#if UPNP_HAVE_DEBUG
-
 #include <stdio.h>

 #ifdef __cplusplus
@@ -49,7 +47,7 @@ extern "C" {
          The UPnP SDK contains other features to aid in debugging.
 */

-//@{
+/*! @{ */

 /** @name Upnp_LogLevel
 *  The user has the option to select 4 different types of debugging levels,
@@ -70,18 +68,25 @@ extern "C" {
 *  \end{itemize}
 */

-typedef enum Upnp_Module {SSDP,SOAP,GENA,TPOOL,MSERV,DOM,API, HTTP} Dbg_Module;
-//@{
+typedef enum Upnp_Module {
+	SSDP,
+	SOAP,
+	GENA,
+	TPOOL,
+	MSERV,
+	DOM,
+	API,
+	HTTP
+} Dbg_Module;
+
+/*! @{ */
 typedef enum Upnp_LogLevel_e {
 	UPNP_CRITICAL,
 	UPNP_PACKET,
 	UPNP_INFO,
 	UPNP_ALL
 } Upnp_LogLevel;
-//@}
-
-// for backward compatibility
-#define Dbg_Level	Upnp_LogLevel
+/*! @} */


 /**
@@ -92,32 +97,38 @@ typedef enum Upnp_LogLevel_e {


 /***************************************************************************
- * Function : UpnpInitLog						
- *								
- * Parameters:	void						
- *									
- * Description:								
+ * Function : UpnpInitLog
+ *
+ * Parameters:	void
+ *
+ * Description:
 *	This functions initializes the log files
+ *
 * Returns: int
 *	-1 : If fails
 *	UPNP_E_SUCCESS : if success
 ***************************************************************************/
+#ifdef DEBUG
 int UpnpInitLog();
-
-// for backward compatibility
-#define InitLog		UpnpInitLog
+#else
+static UPNP_INLINE int UpnpInitLog() { return UPNP_E_SUCCESS; }
+#endif


 /***************************************************************************
 * Function : UpnpSetLogLevel
 *				
- * Parameters:	void
+ * Parameters: Upnp_LogLevel log_level
 *
 * Description:							
 *	This functions set the log level (see {\tt Upnp_LogLevel}
 * Returns: void
 ***************************************************************************/
-void UpnpSetLogLevel (Upnp_LogLevel);
+#ifdef DEBUG
+void UpnpSetLogLevel(Upnp_LogLevel log_level);
+#else
+static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
+#endif


 /***************************************************************************
@@ -129,10 +140,11 @@ void UpnpSetLogLevel (Upnp_LogLevel);
 *	This functions closes the log files
 * Returns: void
 ***************************************************************************/
+#ifdef DEBUG
 void UpnpCloseLog();
-
-// for backward compatibility
-#define CloseLog	UpnpCloseLog
+#else
+static UPNP_INLINE void UpnpCloseLog() {}
+#endif


 /***************************************************************************
@@ -149,17 +161,22 @@ void UpnpCloseLog();
 *	per the requested banner	
 * Returns: void
 ***************************************************************************/
-void UpnpSetLogFileNames (const char* ErrFileName, const char* InfoFileName);
-
-// for backward compatibility
-#define SetLogFileNames		UpnpSetLogFileNames
+#ifdef DEBUG
+void UpnpSetLogFileNames(
+	const char *ErrFileName,
+	const char *InfoFileName);
+#else
+static UPNP_INLINE void UpnpSetLogFileNames(
+	const char *ErrFileName,
+	const char *InfoFileName) {}
+#endif


 /***************************************************************************
 * Function : UpnpGetDebugFile		
 *						
 * Parameters:					
- *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
 *		whether debug statement will go to standard output, 
 *		or any of the log files.
 *	IN Dbg_Module Module: debug will go in the name of this module
@@ -171,17 +188,47 @@ void UpnpSetLogFileNames (const char* ErrFileName, const char* InfoFileName);
 *	NULL : if the module is turn off for debug 
 *	else returns the right file descriptor
 ***************************************************************************/
-FILE* UpnpGetDebugFile (Upnp_LogLevel level, Dbg_Module module);
+#ifdef DEBUG
+FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module);
+#else
+static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module)
+{
+	return NULL;
+}
+#endif

-// for backward compatibility
-#define GetDebugFile	UpnpGetDebugFile
+
+/***************************************************************************
+ * Function : DebugAtThisLevel					
+ *									
+ * Parameters:			
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *					
+ * Description:					
+ *	This functions returns true if debug output should be done in this
+ *	module.
+ *
+ * Returns: int
+ ***************************************************************************/
+#ifdef DEBUG
+int DebugAtThisLevel(
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module);
+#else
+static UPNP_INLINE int DebugAtThisLevel(
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module) { return 0; }
+#endif


 /***************************************************************************
 * Function : UpnpPrintf				
 *									
 * Parameters:								
- *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
 *		whether debug statement will go to standard output, 
 *		or any of the log files.
 *	IN Dbg_Module Module: debug will go in the name of this module
@@ -198,14 +245,28 @@ FILE* UpnpGetDebugFile (Upnp_LogLevel level, Dbg_Module module);
 *	debug statement is coming
 * Returns: void
 ***************************************************************************/ 
-void UpnpPrintf (Upnp_LogLevel DLevel, Dbg_Module Module,
-		 const char* DbgFileName, int DbgLineNo,
-		 const char* FmtStr,
-		 ...)
+#ifdef DEBUG
+void UpnpPrintf(
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	const char* DbgFileName,
+	int DbgLineNo,
+	const char* FmtStr,
+	...)
 #if (__GNUC__ >= 3)
+	/* This enables printf like format checking by the compiler */
 	__attribute__((format (__printf__, 5, 6)))
 #endif
 ;
+#else
+static UPNP_INLINE void UpnpPrintf(
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	const char* DbgFileName,
+	int DbgLineNo,
+	const char* FmtStr,
+	...) {}
+#endif


 /***************************************************************************
@@ -222,8 +283,19 @@ void UpnpPrintf (Upnp_LogLevel DLevel, Dbg_Module Module,
 *	per the requested banner			
 * Returns: void
 ***************************************************************************/
-void UpnpDisplayBanner (FILE *fd,
-			const char** lines, size_t size, int starlength);
+#ifdef DEBUG
+void UpnpDisplayBanner(
+	FILE *fd,
+	const char **lines,
+	size_t size,
+	int starlength);
+#else
+static UPNP_INLINE void UpnpDisplayBanner(
+	FILE *fd,
+	const char **lines,
+	size_t size,
+	int starlength) {}
+#endif


 /***************************************************************************
@@ -240,19 +312,23 @@ void UpnpDisplayBanner (FILE *fd,
 *		debug statement is coming to the log file
 * Returns: void
 ***************************************************************************/
-void UpnpDisplayFileAndLine (FILE *fd, const char *DbgFileName, int DbgLineNo);
-
-
-//@}
+#ifdef DEBUG
+void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo);
+#else
+static UPNP_INLINE void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo) {}
+#endif

+/*! @} */

 #ifdef __cplusplus
 }
 #endif

-#endif // UPNP_HAVE_DEBUG
-
-#endif // UPNP_DEBUG_H
-
-
+#endif /* UPNP_DEBUG_H */

--- a/upnp/inc/upnptools.h
+++ b/upnp/inc/upnptools.h
@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// 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.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * 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.
+ *
+ ******************************************************************************/

 /** @name Optional Tool APIs
 *  The Linux SDK for UPnP Devices contains some additional, optional 
@@ -36,14 +36,14 @@
 *  size in the SDK. Refer to the README for details.
 */

-//@{
+/*! @{ */

 #ifndef UPNP_TOOLS_H
 #define UPNP_TOOLS_H

 #include "upnp.h"

-// Function declarations only if tools compiled into the library
+/* Function declarations only if tools compiled into the library */
 #if UPNP_HAVE_TOOLS

 #ifdef __cplusplus
@@ -217,14 +217,13 @@ EXPORT_SPEC const char * UpnpGetErrorMessage(
        int errorcode  /** The SDK error code to convert. */
        );

-//@}
+/*! @} */

 #ifdef __cplusplus
 }
 #endif

-#endif // UPNP_HAVE_TOOLS
-
-#endif // UPNP_TOOLS_H
+#endif /* UPNP_HAVE_TOOLS */

+#endif /* UPNP_TOOLS_H */

--- a/upnp/sample/Makefile.am
+++ b/upnp/sample/Makefile.am
@@ -0,0 +1,87 @@
+#
+# "Makefile.am" for "libupnp/upnp/sample"
+#
+# Copyright (C) 2007 Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
+#
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/upnp/inc \
+	-I$(top_srcdir)/threadutil/inc \
+	-I$(top_srcdir)/ixml/inc
+
+AM_CFLAGS = $(PTHREAD_CFLAGS)
+
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
+LDADD = \
+	$(top_builddir)/upnp/libupnp.la \
+	$(top_builddir)/threadutil/libthreadutil.la \
+	$(top_builddir)/ixml/libixml.la
+
+
+# samples
+noinst_PROGRAMS =
+if ENABLE_SAMPLES
+if ENABLE_CLIENT
+noinst_PROGRAMS += upnp_tv_ctrlpt
+upnp_tv_ctrlpt_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(srcdir)/common/ \
+	-I$(srcdir)/tvctrlpt
+if ENABLE_DEVICE
+noinst_PROGRAMS += upnp_tv_combo
+upnp_tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
+	-I$(srcdir)/common/ \
+	-I$(srcdir)/tvcombo
+endif
+endif
+if ENABLE_DEVICE
+noinst_PROGRAMS += upnp_tv_device
+upnp_tv_device_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(srcdir)/common/ \
+	-I$(srcdir)/tvdevice
+endif
+endif
+
+
+upnp_tv_device_SOURCES = \
+	common/sample_util.c \
+	common/sample_util.h \
+	tvdevice/upnp_tv_device.c \
+	tvdevice/upnp_tv_device.h \
+	tvdevice/linux/upnp_tv_device_main.c
+
+
+upnp_tv_ctrlpt_SOURCES = \
+	common/sample_util.c \
+	common/sample_util.h \
+	tvctrlpt/upnp_tv_ctrlpt.c \
+	tvctrlpt/upnp_tv_ctrlpt.h \
+	tvctrlpt/linux/upnp_tv_ctrlpt_main.c
+
+upnp_tv_combo_SOURCES = \
+	common/sample_util.c \
+	common/sample_util.h \
+	tvcombo/upnp_tv_ctrlpt.c \
+	tvcombo/upnp_tv_ctrlpt.h \
+	tvcombo/upnp_tv_device.c \
+	tvcombo/upnp_tv_device.h \
+	tvcombo/linux/upnp_tv_combo_main.c
+
+
+if WITH_DOCUMENTATION
+examplesdir = $(docdir)/examples
+examples_DATA = \
+		$(upnp_tv_ctrlpt_SOURCES) \
+		$(upnp_tv_device_SOURCES)
+endif
+
+
+EXTRA_DIST = \
+	web/tvcombodesc.xml \
+	web/tvcontrolSCPD.xml \
+	web/tvdevicedesc.xml \
+	web/tvdevicepres.html \
+	web/tvpictureSCPD.xml
+
--- a/upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
+++ b/upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
@@ -0,0 +1,489 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// 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.
+//
+///////////////////////////////////////////////////////////////////////////
+
+
+#include "sample_util.h"
+#include "upnp_tv_ctrlpt.h"
+#include "upnp_tv_device.h"
+
+
+#include <stdio.h>
+#include <string.h>
+
+/*
+   Tags for valid commands issued at the command prompt 
+ */
+enum cmdloop_tvcmds {
+    PRTHELP = 0, PRTFULLHELP, POWON, POWOFF,
+    SETCHAN, SETVOL, SETCOL, SETTINT, SETCONT, SETBRT,
+    CTRLACTION, PICTACTION, CTRLGETVAR, PICTGETVAR,
+    PRTDEV, LSTDEV, REFRESH, EXITCMD
+};
+
+/*
+   Data structure for parsing commands from the command line 
+ */
+struct cmdloop_commands {
+    char *str;                  // the string 
+    int cmdnum;                 // the command
+    int numargs;                // the number of arguments
+    char *args;                 // the args
+} cmdloop_commands;
+
+/*
+   Mappings between command text names, command tag,
+   and required command arguments for command line
+   commands 
+ */
+static struct cmdloop_commands cmdloop_cmdlist[] = {
+    {"Help", PRTHELP, 1, ""},
+    {"HelpFull", PRTFULLHELP, 1, ""},
+    {"ListDev", LSTDEV, 1, ""},
+    {"Refresh", REFRESH, 1, ""},
+    {"PrintDev", PRTDEV, 2, "<devnum>"},
+    {"PowerOn", POWON, 2, "<devnum>"},
+    {"PowerOff", POWOFF, 2, "<devnum>"},
+    {"SetChannel", SETCHAN, 3, "<devnum> <channel (int)>"},
+    {"SetVolume", SETVOL, 3, "<devnum> <volume (int)>"},
+    {"SetColor", SETCOL, 3, "<devnum> <color (int)>"},
+    {"SetTint", SETTINT, 3, "<devnum> <tint (int)>"},
+    {"SetContrast", SETCONT, 3, "<devnum> <contrast (int)>"},
+    {"SetBrightness", SETBRT, 3, "<devnum> <brightness (int)>"},
+    {"CtrlAction", CTRLACTION, 2, "<devnum> <action (string)>"},
+    {"PictAction", PICTACTION, 2, "<devnum> <action (string)>"},
+    {"CtrlGetVar", CTRLGETVAR, 2, "<devnum> <varname (string)>"},
+    {"PictGetVar", PICTGETVAR, 2, "<devnum> <varname (string)>"},
+    {"Exit", EXITCMD, 1, ""}
+};
+
+void
+linux_print( const char *string )
+{
+    puts( string );
+}
+
+/********************************************************************************
+ * TvCtrlPointPrintHelp
+ *
+ * Description: 
+ *       Print help info for this application.
+ ********************************************************************************/
+void
+TvCtrlPointPrintShortHelp( void )
+{
+    SampleUtil_Print( "Commands:" );
+    SampleUtil_Print( "  Help" );
+    SampleUtil_Print( "  HelpFull" );
+    SampleUtil_Print( "  ListDev" );
+    SampleUtil_Print( "  Refresh" );
+    SampleUtil_Print( "  PrintDev      <devnum>" );
+    SampleUtil_Print( "  PowerOn       <devnum>" );
+    SampleUtil_Print( "  PowerOff      <devnum>" );
+    SampleUtil_Print( "  SetChannel    <devnum> <channel>" );
+    SampleUtil_Print( "  SetVolume     <devnum> <volume>" );
+    SampleUtil_Print( "  SetColor      <devnum> <color>" );
+    SampleUtil_Print( "  SetTint       <devnum> <tint>" );
+    SampleUtil_Print( "  SetContrast   <devnum> <contrast>" );
+    SampleUtil_Print( "  SetBrightness <devnum> <brightness>" );
+    SampleUtil_Print( "  CtrlAction    <devnum> <action>" );
+    SampleUtil_Print( "  PictAction    <devnum> <action>" );
+    SampleUtil_Print( "  CtrlGetVar    <devnum> <varname>" );
+    SampleUtil_Print( "  PictGetVar    <devnum> <action>" );
+    SampleUtil_Print( "  Exit" );
+}
+
+void
+TvCtrlPointPrintLongHelp( void )
+{
+    SampleUtil_Print( "" );
+    SampleUtil_Print( "******************************" );
+    SampleUtil_Print( "* TV Control Point Help Info *" );
+    SampleUtil_Print( "******************************" );
+    SampleUtil_Print( "" );
+    SampleUtil_Print( "This sample control point application automatically searches" );
+    SampleUtil_Print( "for and subscribes to the services of television device emulator" );
+    SampleUtil_Print( "devices. While registers a tv device itself." );
+    SampleUtil_Print( "" );
+    SampleUtil_Print( "Commands:" );
+    SampleUtil_Print( "  Help" );
+    SampleUtil_Print( "       Print this help info." );
+    SampleUtil_Print( "  ListDev" );
+    SampleUtil_Print( "       Print the current list of TV Device Emulators that this" );
+    SampleUtil_Print( "         control point is aware of.  Each device is preceded by a" );
+    SampleUtil_Print( "         device number which corresponds to the devnum argument of" );
+    SampleUtil_Print( "         commands listed below." );
+    SampleUtil_Print( "  Refresh" );
+    SampleUtil_Print( "       Delete all of the devices from the device list and issue new" );
+    SampleUtil_Print( "         search request to rebuild the list from scratch." );
+    SampleUtil_Print( "  PrintDev       <devnum>" );
+    SampleUtil_Print( "       Print the state table for the device <devnum>." );
+    SampleUtil_Print( "         e.g., 'PrintDev 1' prints the state table for the first" );
+    SampleUtil_Print( "         device in the device list." );
+    SampleUtil_Print( "  PowerOn        <devnum>" );
+    SampleUtil_Print( "       Sends the PowerOn action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>." );
+    SampleUtil_Print( "  PowerOff       <devnum>" );
+    SampleUtil_Print( "       Sends the PowerOff action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>." );
+    SampleUtil_Print( "  SetChannel     <devnum> <channel>" );
+    SampleUtil_Print( "       Sends the SetChannel action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the channel to be changed" );
+    SampleUtil_Print( "         to <channel>." );
+    SampleUtil_Print( "  SetVolume      <devnum> <volume>" );
+    SampleUtil_Print( "       Sends the SetVolume action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the volume to be changed" );
+    SampleUtil_Print( "         to <volume>." );
+    SampleUtil_Print( "  SetColor       <devnum> <color>" );
+    SampleUtil_Print( "       Sends the SetColor action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the color to be changed" );
+    SampleUtil_Print( "         to <color>." );
+    SampleUtil_Print( "  SetTint        <devnum> <tint>" );
+    SampleUtil_Print( "       Sends the SetTint action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the tint to be changed" );
+    SampleUtil_Print( "         to <tint>." );
+    SampleUtil_Print( "  SetContrast    <devnum> <contrast>" );
+    SampleUtil_Print( "       Sends the SetContrast action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the contrast to be changed" );
+    SampleUtil_Print( "         to <contrast>." );
+    SampleUtil_Print( "  SetBrightness  <devnum> <brightness>" );
+    SampleUtil_Print( "       Sends the SetBrightness action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the brightness to be changed" );
+    SampleUtil_Print( "         to <brightness>." );
+    SampleUtil_Print( "  CtrlAction     <devnum> <action>" );
+    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
+    SampleUtil_Print( "         to the Control Service of device <devnum>.  This command" );
+    SampleUtil_Print( "         only works for actions that have no arguments." );
+    SampleUtil_Print( "         (e.g., \"CtrlAction 1 IncreaseChannel\")" );
+    SampleUtil_Print( "  PictAction     <devnum> <action>" );
+    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
+    SampleUtil_Print( "         to the Picture Service of device <devnum>.  This command" );
+    SampleUtil_Print( "         only works for actions that have no arguments." );
+    SampleUtil_Print( "         (e.g., \"PictAction 1 DecreaseContrast\")" );
+    SampleUtil_Print( "  CtrlGetVar     <devnum> <varname>" );
+    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
+    SampleUtil_Print( "         from the Control Service of device <devnum>." );
+    SampleUtil_Print( "         (e.g., \"CtrlGetVar 1 Volume\")" );
+    SampleUtil_Print( "  PictGetVar     <devnum> <action>" );
+    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
+    SampleUtil_Print( "         from the Picture Service of device <devnum>." );
+    SampleUtil_Print( "         (e.g., \"PictGetVar 1 Tint\")" );
+    SampleUtil_Print( "  Exit" );
+    SampleUtil_Print( "       Exits the control point application." );
+}
+
+/********************************************************************************
+ * TvCtrlPointPrintCommands
+ *
+ * Description: 
+ *       Print the list of valid command line commands to the user
+ *
+ * Parameters:
+ *   None
+ *
+ ********************************************************************************/
+void
+TvCtrlPointPrintCommands()
+{
+    int i;
+    int numofcmds = sizeof( cmdloop_cmdlist ) / sizeof( cmdloop_commands );
+
+    SampleUtil_Print( "Valid Commands:" );
+    for( i = 0; i < numofcmds; i++ ) {
+        SampleUtil_Print( "  %-14s %s", cmdloop_cmdlist[i].str,
+                          cmdloop_cmdlist[i].args );
+    }
+    SampleUtil_Print( "" );
+}
+
+/********************************************************************************
+ * TvCtrlPointCommandLoop
+ *
+ * Description: 
+ *       Function that receives commands from the user at the command prompt
+ *       during the lifetime of the control point, and calls the appropriate
+ *       functions for those commands.
+ *
+ * Parameters:
+ *    None
+ *
+ ********************************************************************************/
+void *
+TvCtrlPointCommandLoop( void *args )
+{
+    char cmdline[100];
+
+    while( 1 ) {
+        SampleUtil_Print( "\n>> " );
+        fgets( cmdline, 100, stdin );
+        TvCtrlPointProcessCommand( cmdline );
+    }
+
+    return NULL;
+}
+
+int
+TvCtrlPointProcessCommand( char *cmdline )
+{
+    char cmd[100];
+    char strarg[100];
+    int arg_val_err = -99999;
+    int arg1 = arg_val_err;
+    int arg2 = arg_val_err;
+    int cmdnum = -1;
+    int numofcmds = sizeof( cmdloop_cmdlist ) / sizeof( cmdloop_commands );
+    int cmdfound = 0;
+    int i,
+      rc;
+    int invalidargs = 0;
+    int validargs;
+
+    validargs = sscanf( cmdline, "%s %d %d", cmd, &arg1, &arg2 );
+
+    for( i = 0; i < numofcmds; i++ ) {
+        if( strcasecmp( cmd, cmdloop_cmdlist[i].str ) == 0 ) {
+            cmdnum = cmdloop_cmdlist[i].cmdnum;
+            cmdfound++;
+            if( validargs != cmdloop_cmdlist[i].numargs )
+                invalidargs++;
+            break;
+        }
+    }
+
+    if( !cmdfound ) {
+        SampleUtil_Print( "Command not found; try 'Help'" );
+        return TV_SUCCESS;
+    }
+
+    if( invalidargs ) {
+        SampleUtil_Print( "Invalid arguments; try 'Help'" );
+        return TV_SUCCESS;
+    }
+
+    switch ( cmdnum ) {
+        case PRTHELP:
+            TvCtrlPointPrintShortHelp();
+            break;
+
+        case PRTFULLHELP:
+            TvCtrlPointPrintLongHelp();
+            break;
+
+        case POWON:
+            TvCtrlPointSendPowerOn( arg1 );
+            break;
+
+        case POWOFF:
+            TvCtrlPointSendPowerOff( arg1 );
+            break;
+
+        case SETCHAN:
+            TvCtrlPointSendSetChannel( arg1, arg2 );
+            break;
+
+        case SETVOL:
+            TvCtrlPointSendSetVolume( arg1, arg2 );
+            break;
+
+        case SETCOL:
+            TvCtrlPointSendSetColor( arg1, arg2 );
+            break;
+
+        case SETTINT:
+            TvCtrlPointSendSetTint( arg1, arg2 );
+            break;
+
+        case SETCONT:
+            TvCtrlPointSendSetContrast( arg1, arg2 );
+            break;
+
+        case SETBRT:
+            TvCtrlPointSendSetBrightness( arg1, arg2 );
+            break;
+
+        case CTRLACTION:
+            /*
+               re-parse commandline since second arg is string 
+             */
+            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
+            if( 3 == validargs )
+                TvCtrlPointSendAction( TV_SERVICE_CONTROL, arg1, strarg,
+                                       NULL, NULL, 0 );
+            else
+                invalidargs++;
+            break;
+
+        case PICTACTION:
+            /*
+               re-parse commandline since second arg is string 
+             */
+            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
+            if( 3 == validargs )
+                TvCtrlPointSendAction( TV_SERVICE_PICTURE, arg1, strarg,
+                                       NULL, NULL, 0 );
+            else
+                invalidargs++;
+            break;
+
+        case CTRLGETVAR:
+            /*
+               re-parse commandline since second arg is string 
+             */
+            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
+            if( 3 == validargs )
+                TvCtrlPointGetVar( TV_SERVICE_CONTROL, arg1, strarg );
+            else
+                invalidargs++;
+            break;
+
+        case PICTGETVAR:
+            /*
+               re-parse commandline since second arg is string 
+             */
+            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
+            if( 3 == validargs )
+                TvCtrlPointGetVar( TV_SERVICE_PICTURE, arg1, strarg );
+            else
+                invalidargs++;
+            break;
+
+        case PRTDEV:
+            TvCtrlPointPrintDevice( arg1 );
+            break;
+
+        case LSTDEV:
+            TvCtrlPointPrintList();
+            break;
+
+        case REFRESH:
+            TvCtrlPointRefresh();
+            break;
+
+        case EXITCMD:
+            rc = TvCtrlPointStop();
+            exit( rc );
+            break;
+
+        default:
+            SampleUtil_Print( "Command not implemented; see 'Help'" );
+            break;
+    }
+
+    if( invalidargs )
+        SampleUtil_Print( "Invalid args in command; see 'Help'" );
+
+    return TV_SUCCESS;
+}
+
+int
+device_main( int argc, char **argv )
+{
+
+    unsigned int portTemp = 0;
+    char *ip_address = NULL,
+     *desc_doc_name = NULL,
+     *web_dir_path = NULL;
+    unsigned int port = 0;
+
+    int i = 0;
+
+    SampleUtil_Initialize( linux_print );
+
+    // Parse options
+    for( i = 1; i < argc; i++ ) {
+        if( strcmp( argv[i], "-ip" ) == 0 ) {
+            ip_address = argv[++i];
+        } else if( strcmp( argv[i], "-port" ) == 0 ) {
+            sscanf( argv[++i], "%u", &portTemp );
+        } else if( strcmp( argv[i], "-desc" ) == 0 ) {
+            desc_doc_name = argv[++i];
+        } else if( strcmp( argv[i], "-webdir" ) == 0 ) {
+            web_dir_path = argv[++i];
+        } else if( strcmp( argv[i], "-help" ) == 0 ) {
+            SampleUtil_Print( "Usage: %s -ip ipaddress -port port"
+                              " -desc desc_doc_name -webdir web_dir_path"
+                              " -help (this message)\n", argv[0] );
+            SampleUtil_Print( "\tipaddress:     IP address of the device"
+                              " (must match desc. doc)\n" );
+            SampleUtil_Print( "\t\te.g.: 192.168.0.4\n" );
+            SampleUtil_Print( "\tport:          Port number to use for "
+                              "receiving UPnP messages (must match desc. doc)\n" );
+            SampleUtil_Print( "\t\te.g.: 5431\n" );
+            SampleUtil_Print
+                ( "\tdesc_doc_name: name of device description document\n" );
+            SampleUtil_Print( "\t\te.g.: tvcombodesc.xml\n" );
+            SampleUtil_Print
+                ( "\tweb_dir_path: Filesystem path where web files "
+                  "related to the device are stored\n" );
+            SampleUtil_Print( "\t\te.g.: /upnp/sample/web\n" );
+            return 1;
+        }
+    }
+
+    port = ( unsigned short )portTemp;
+
+    return TvDeviceStart(
+        ip_address, port, desc_doc_name, web_dir_path, linux_print );
+}
+
+int
+main( int argc, char **argv )
+{
+    int rc;
+    ithread_t cmdloop_thread;
+    int sig;
+    sigset_t sigs_to_catch;
+    int code;
+
+    device_main(argc, argv);
+    rc = TvCtrlPointStart( linux_print, NULL );
+    if( rc != TV_SUCCESS ) {
+        SampleUtil_Print( "Error starting UPnP TV Control Point" );
+        return rc;
+    }
+    // start a command loop thread
+    code =
+        ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop,
+                        NULL );
+
+    /*
+       Catch Ctrl-C and properly shutdown 
+     */
+    sigemptyset( &sigs_to_catch );
+    sigaddset( &sigs_to_catch, SIGINT );
+    sigwait( &sigs_to_catch, &sig );
+
+    SampleUtil_Print( "Shutting down on signal %d...", sig );
+    TvDeviceStop();
+    rc = TvCtrlPointStop();
+    
+    return rc;
+}
+
--- a/upnp/sample/tvcombo/upnp_tv_ctrlpt.c
+++ b/upnp/sample/tvcombo/upnp_tv_ctrlpt.c
--- a/upnp/sample/tvcombo/upnp_tv_ctrlpt.h
+++ b/upnp/sample/tvcombo/upnp_tv_ctrlpt.h
@@ -0,0 +1,158 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// 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_TV_CTRLPT_H
+#define UPNP_TV_CTRLPT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+
+#include "ithread.h"
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+
+#include "upnp.h"
+#include "upnptools.h"
+#include "sample_util.h"
+
+#define TV_SERVICE_SERVCOUNT	2
+#define TV_SERVICE_CONTROL		0
+#define TV_SERVICE_PICTURE		1
+
+#define TV_CONTROL_VARCOUNT		3
+#define TV_CONTROL_POWER		0
+#define TV_CONTROL_CHANNEL		1
+#define TV_CONTROL_VOLUME		2
+
+#define TV_PICTURE_VARCOUNT		4
+#define TV_PICTURE_COLOR		0
+#define TV_PICTURE_TINT			1
+#define TV_PICTURE_CONTRAST		2
+#define TV_PICTURE_BRIGHTNESS	3
+
+#define TV_MAX_VAL_LEN			5
+
+#define TV_SUCCESS				0
+#define TV_ERROR				(-1)
+#define TV_WARNING				1
+
+/* This should be the maximum VARCOUNT from above */
+#define TV_MAXVARS				TV_PICTURE_VARCOUNT
+
+extern char TvDeviceType[];
+extern char *TvServiceType[];
+extern char *TvServiceName[];
+extern char *TvVarName[TV_SERVICE_SERVCOUNT][TV_MAXVARS];
+extern char TvVarCount[];
+
+struct tv_service {
+    char ServiceId[NAME_SIZE];
+    char ServiceType[NAME_SIZE];
+    char *VariableStrVal[TV_MAXVARS];
+    char EventURL[NAME_SIZE];
+    char ControlURL[NAME_SIZE];
+    char SID[NAME_SIZE];
+};
+
+extern struct TvDeviceNode *GlobalDeviceList;
+
+struct TvDevice {
+    char UDN[250];
+    char DescDocURL[250];
+    char FriendlyName[250];
+    char PresURL[250];
+    int  AdvrTimeOut;
+    struct tv_service TvService[TV_SERVICE_SERVCOUNT];
+};
+
+struct TvDeviceNode {
+    struct TvDevice device;
+    struct TvDeviceNode *next;
+};
+
+extern ithread_mutex_t DeviceListMutex;
+
+extern UpnpClient_Handle ctrlpt_handle;
+
+void	TvCtrlPointPrintHelp( void );
+int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
+int		TvCtrlPointRemoveDevice(char*);
+int		TvCtrlPointRemoveAll( void );
+int		TvCtrlPointRefresh( void );
+
+
+int		TvCtrlPointSendAction(int, int, char *, char **, char **, int);
+int		TvCtrlPointSendActionNumericArg(int devnum, int service, char *actionName, char *paramName, int paramValue);
+int		TvCtrlPointSendPowerOn(int devnum);
+int		TvCtrlPointSendPowerOff(int devnum);
+int		TvCtrlPointSendSetChannel(int, int);
+int		TvCtrlPointSendSetVolume(int, int);
+int		TvCtrlPointSendSetColor(int, int);
+int		TvCtrlPointSendSetTint(int, int);
+int		TvCtrlPointSendSetContrast(int, int);
+int		TvCtrlPointSendSetBrightness(int, int);
+
+int		TvCtrlPointGetVar(int, int, char*);
+int		TvCtrlPointGetPower(int devnum);
+int		TvCtrlPointGetChannel(int);
+int		TvCtrlPointGetVolume(int);
+int		TvCtrlPointGetColor(int);
+int		TvCtrlPointGetTint(int);
+int		TvCtrlPointGetContrast(int);
+int		TvCtrlPointGetBrightness(int);
+
+int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
+int		TvCtrlPointPrintList( void );
+int		TvCtrlPointPrintDevice(int);
+void	TvCtrlPointAddDevice (IXML_Document *, char *, int); 
+void    TvCtrlPointHandleGetVar(char *,char *,DOMString);
+void	TvStateUpdate(char*,int, IXML_Document * , char **);
+void	TvCtrlPointHandleEvent(Upnp_SID, int, IXML_Document *); 
+void	TvCtrlPointHandleSubscribeUpdate(char *, Upnp_SID, int); 
+int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
+void	TvCtrlPointVerifyTimeouts(int);
+void	TvCtrlPointPrintCommands( void );
+void*	TvCtrlPointCommandLoop( void* );
+int		TvCtrlPointStart( print_string printFunctionPtr, state_update updateFunctionPtr );
+int		TvCtrlPointStop( void );
+int		TvCtrlPointProcessCommand( char *cmdline );
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif //UPNP_TV_CTRLPT_H
--- a/upnp/sample/tvcombo/upnp_tv_device.c
+++ b/upnp/sample/tvcombo/upnp_tv_device.c
--- a/upnp/sample/tvcombo/upnp_tv_device.h
+++ b/upnp/sample/tvcombo/upnp_tv_device.h
@@ -0,0 +1,638 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// 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_TV_DEVICE_H
+#define UPNP_TV_DEVICE_H
+
+#include <stdio.h>
+#include <signal.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ithread.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include "upnp.h"
+#include "sample_util.h"
+
+//Color constants
+#define MAX_COLOR 10
+#define MIN_COLOR 1
+
+//Brightness constants
+#define MAX_BRIGHTNESS 10
+#define MIN_BRIGHTNESS 1
+
+//Power constants
+#define POWER_ON 1
+#define POWER_OFF 0
+
+//Tint constants
+#define MAX_TINT 10
+#define MIN_TINT 1
+
+//Volume constants
+#define MAX_VOLUME 10
+#define MIN_VOLUME 1
+
+//Contrast constants
+#define MAX_CONTRAST 10
+#define MIN_CONTRAST 1
+
+//Channel constants
+#define MAX_CHANNEL 100
+#define MIN_CHANNEL 1
+
+//Number of services.
+#define TV_SERVICE_SERVCOUNT  2
+
+//Index of control service
+#define TV_SERVICE_CONTROL    0
+
+//Index of picture service
+#define TV_SERVICE_PICTURE    1
+
+//Number of control variables
+#define TV_CONTROL_VARCOUNT   3
+
+//Index of power variable
+#define TV_CONTROL_POWER      0
+
+//Index of channel variable
+#define TV_CONTROL_CHANNEL    1
+
+//Index of volume variable
+#define TV_CONTROL_VOLUME     2
+
+//Number of picture variables
+#define TV_PICTURE_VARCOUNT   4
+
+//Index of color variable
+#define TV_PICTURE_COLOR      0
+
+//Index of tint variable
+#define TV_PICTURE_TINT       1
+
+//Index of contrast variable
+#define TV_PICTURE_CONTRAST   2
+
+//Index of brightness variable
+#define TV_PICTURE_BRIGHTNESS 3
+
+//Max value length
+#define TV_MAX_VAL_LEN 5
+
+//Max actions
+#define TV_MAXACTIONS 12
+
+/* This should be the maximum VARCOUNT from above */
+#define TV_MAXVARS TV_PICTURE_VARCOUNT
+
+
+extern char TvDeviceType[];
+
+extern char *TvServiceType[];
+
+
+
+/******************************************************************************
+ * upnp_action
+ *
+ * Description: 
+ *       Prototype for all actions. For each action that a service 
+ *       implements, there is a corresponding function with this prototype.
+ *       Pointers to these functions, along with action names, are stored
+ *       in the service table. When an action request comes in the action
+ *       name is matched, and the appropriate function is called.
+ *       Each function returns UPNP_E_SUCCESS, on success, and a nonzero 
+ *       error code on failure.
+ *
+ * Parameters:
+ *
+ *    IXML_Document * request - document of action request
+ *    IXML_Document **out - action result
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+
+typedef int (*upnp_action) (IXML_Document *request, IXML_Document **out, 
+			    char **errorString);
+
+/* Structure for storing Tv Service
+   identifiers and state table */
+struct TvService {
+  
+  char UDN[NAME_SIZE]; /* Universally Unique Device Name */
+  char ServiceId[NAME_SIZE];
+  char ServiceType[NAME_SIZE];
+  char *VariableName[TV_MAXVARS]; 
+  char *VariableStrVal[TV_MAXVARS];
+  char *ActionNames[TV_MAXACTIONS];
+  upnp_action actions[TV_MAXACTIONS];
+  unsigned int  VariableCount;
+};
+
+//Array of service structures
+extern struct TvService tv_service_table[];
+
+//Device handle returned from sdk
+extern UpnpDevice_Handle device_handle;
+
+
+/* Mutex for protecting the global state table data
+   in a multi-threaded, asynchronous environment.
+   All functions should lock this mutex before reading
+   or writing the state table data. */
+extern ithread_mutex_t TVDevMutex;
+
+
+
+/******************************************************************************
+ * SetActionTable
+ *
+ * Description: 
+ *       Initializes the action table for the specified service.
+ *       Note that 
+ *       knowledge of the service description is
+ *       assumed.  Action names are hardcoded.
+ * Parameters:
+ *   int serviceType - one of TV_SERVICE_CONTROL or, TV_SERVICE_PICTURE
+ *   struct TvService *out - service containing action table to set.
+ *
+ *****************************************************************************/
+int SetActionTable(int serviceType, struct TvService * out);
+
+/******************************************************************************
+ * TvDeviceStateTableInit
+ *
+ * Description: 
+ *       Initialize the device state table for 
+ * 	 this TvDevice, pulling identifier info
+ *       from the description Document.  Note that 
+ *       knowledge of the service description is
+ *       assumed.  State table variables and default
+ *       values are currently hardcoded in this file
+ *       rather than being read from service description
+ *       documents.
+ *
+ * Parameters:
+ *   DescDocURL -- The description document URL
+ *
+ *****************************************************************************/
+int TvDeviceStateTableInit(char*);
+
+
+/******************************************************************************
+ * TvDeviceHandleSubscriptionRequest
+ *
+ * Description: 
+ *       Called during a subscription request callback.  If the
+ *       subscription request is for this device and either its
+ *       control service or picture service, then accept it.
+ *
+ * Parameters:
+ *   sr_event -- The subscription request event structure
+ *
+ *****************************************************************************/
+int TvDeviceHandleSubscriptionRequest(struct Upnp_Subscription_Request *);
+
+/******************************************************************************
+ * TvDeviceHandleGetVarRequest
+ *
+ * Description: 
+ *       Called during a get variable request callback.  If the
+ *       request is for this device and either its control service
+ *       or picture service, then respond with the variable value.
+ *
+ * Parameters:
+ *   cgv_event -- The control get variable request event structure
+ *
+ *****************************************************************************/
+int TvDeviceHandleGetVarRequest(struct Upnp_State_Var_Request *);
+
+/******************************************************************************
+ * TvDeviceHandleActionRequest
+ *
+ * Description: 
+ *       Called during an action request callback.  If the
+ *       request is for this device and either its control service
+ *       or picture service, then perform the action and respond.
+ *
+ * Parameters:
+ *   ca_event -- The control action request event structure
+ *
+ *****************************************************************************/
+int TvDeviceHandleActionRequest(struct Upnp_Action_Request *);
+
+/******************************************************************************
+ * TvDeviceCallbackEventHandler
+ *
+ * Description: 
+ *       The callback handler registered with the SDK while registering
+ *       root device.  Dispatches the request to the appropriate procedure
+ *       based on the value of EventType. The four requests handled by the 
+ *       device are: 
+ *                   1) Event Subscription requests.  
+ *                   2) Get Variable requests. 
+ *                   3) Action requests.
+ *
+ * Parameters:
+ *
+ *   EventType -- The type of callback event
+ *   Event -- Data structure containing event data
+ *   Cookie -- Optional data specified during callback registration
+ *
+ *****************************************************************************/
+int TvDeviceCallbackEventHandler(Upnp_EventType, void*, void*);
+
+/******************************************************************************
+ * TvDeviceSetServiceTableVar
+ *
+ * Description: 
+ *       Update the TvDevice service state table, and notify all subscribed 
+ *       control points of the updated state.  Note that since this function
+ *       blocks on the mutex TVDevMutex, to avoid a hang this function should 
+ *       not be called within any other function that currently has this mutex 
+ *       locked.
+ *
+ * Parameters:
+ *   service -- The service number (TV_SERVICE_CONTROL or TV_SERVICE_PICTURE)
+ *   variable -- The variable number (TV_CONTROL_POWER, TV_CONTROL_CHANNEL,
+ *                   TV_CONTROL_VOLUME, TV_PICTURE_COLOR, TV_PICTURE_TINT,
+ *                   TV_PICTURE_CONTRAST, or TV_PICTURE_BRIGHTNESS)
+ *   value -- The string representation of the new value
+ *
+ *****************************************************************************/
+int TvDeviceSetServiceTableVar(unsigned int, unsigned int, char*);
+
+//Control Service Actions
+
+/******************************************************************************
+ * TvDevicePowerOn
+ *
+ * Description: 
+ *       Turn the power on.
+ *
+ * Parameters:
+ *
+ *    IXML_Document * in - document of action request
+ *    IXML_Document **out - action result
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDevicePowerOn(IN IXML_Document * in, OUT IXML_Document **out, 
+		    OUT char **errorString);
+
+/******************************************************************************
+ * TvDevicePowerOff
+ *
+ * Description: 
+ *       Turn the power off.
+ *
+ * Parameters:
+ *    
+ *    IXML_Document * in - document of action request
+ *    IXML_Document **out - action result
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDevicePowerOff(IN IXML_Document *in, OUT IXML_Document **out, 
+		     OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceSetChannel
+ *
+ * Description: 
+ *       Change the channel, update the TvDevice control service
+ *       state table, and notify all subscribed control points of the
+ *       updated state.
+ *
+ * Parameters:
+ *    
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceSetChannel(IN IXML_Document *in, OUT IXML_Document **out, 
+		       OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceIncreaseChannel
+ *
+ * Description: 
+ *       Increase the channel.  
+ *
+ * Parameters:
+ *   
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceIncreaseChannel(IN IXML_Document *in, OUT IXML_Document **out, 
+			    OUT char **errorString);
+/******************************************************************************
+ * TvDeviceDecreaseChannel
+ *
+ * Description: 
+ *       Decrease the channel.  
+ *
+ * Parameters:
+ *   
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceDecreaseChannel(IN IXML_Document *in, OUT IXML_Document **out, 
+			    OUT char **errorString);
+/******************************************************************************
+ * TvDeviceSetVolume
+ *
+ * Description: 
+ *       Change the volume, update the TvDevice control service
+ *       state table, and notify all subscribed control points of the
+ *       updated state.
+ *
+ * Parameters:
+ *  
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceSetVolume(IN IXML_Document *in, OUT IXML_Document **out, 
+		      OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceIncreaseVolume
+ *
+ * Description: 
+ *       Increase the volume. 
+ *
+ * Parameters:
+ *   
+ *
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *****************************************************************************/
+int TvDeviceIncreaseVolume(IN IXML_Document *in, OUT IXML_Document**out, 
+			   OUT char **errorString);
+
+
+/******************************************************************************
+ * TvDeviceDecreaseVolume
+ *
+ * Description: 
+ *       Decrease the volume.
+ *
+ * Parameters:
+ *   
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceDecreaseVolume(IN IXML_Document *in, OUT IXML_Document**out, 
+			   OUT char **errorString);
+
+
+//Picture Service Actions
+
+/******************************************************************************
+ * TvDeviceSetColor
+ *
+ * Description: 
+ *       Change the color, update the TvDevice picture service
+ *       state table, and notify all subscribed control points of the
+ *       updated state.
+ *
+ * Parameters:
+ *   
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceSetColor(IN IXML_Document *in, OUT IXML_Document **out, 
+		     OUT char **errorString);
+
+
+/******************************************************************************
+ * TvDeviceIncreaseColor
+ *
+ * Description: 
+ *       Increase the color.
+ *
+ * Parameters:
+ *
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *****************************************************************************/
+int TvDeviceIncreaseColor(IN IXML_Document * in, OUT IXML_Document **out, 
+			  OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceDecreaseColor
+ *
+ * Description: 
+ *       Decrease the color.  
+ *
+ * Parameters:
+ *   
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *****************************************************************************/
+int TvDeviceDecreaseColor(IN IXML_Document * in, OUT IXML_Document **out, 
+			  OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceSetTint
+ *
+ * Description: 
+ *       Change the tint, update the TvDevice picture service
+ *       state table, and notify all subscribed control points of the
+ *       updated state.
+ *
+ * Parameters:
+ *
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceSetTint(IN IXML_Document *in, OUT IXML_Document **out, 
+		    OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceIncreaseTint
+ *
+ * Description: 
+ *       Increase tint.
+ *
+ * Parameters:
+ *   
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceIncreaseTint(IN IXML_Document *in, OUT IXML_Document **out, 
+			 OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceDecreaseTint
+ *
+ * Description: 
+ *       Decrease tint.
+ *
+ * Parameters:
+ *  
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceDecreaseTint(IN IXML_Document *in, OUT IXML_Document **out, 
+			 OUT char **errorString);
+
+/*****************************************************************************
+ * TvDeviceSetContrast
+ *
+ * Description: 
+ *       Change the contrast, update the TvDevice picture service
+ *       state table, and notify all subscribed control points of the
+ *       updated state.
+ *
+ * Parameters:
+ *   
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ ****************************************************************************/
+int TvDeviceSetContrast(IN IXML_Document *in, OUT IXML_Document **out, 
+			OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceIncreaseContrast
+ *
+ * Description: 
+ *
+ *      Increase the contrast.
+ *
+ * Parameters:
+ *       
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceIncreaseContrast(IN IXML_Document *in, OUT IXML_Document **out, 
+			     OUT char **errorString);
+/******************************************************************************
+ * TvDeviceDecreaseContrast
+ *
+ * Description: 
+ *      Decrease the contrast.
+ *
+ * Parameters:
+ *          
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceDecreaseContrast(IN IXML_Document *in, OUT IXML_Document **out, 
+			     OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceSetBrightness
+ *
+ * Description: 
+ *       Change the brightness, update the TvDevice picture service
+ *       state table, and notify all subscribed control points of the
+ *       updated state.
+ *
+ * Parameters:
+ *   brightness -- The brightness value to change to.
+ *
+ *****************************************************************************/
+int TvDeviceSetBrightness(IN IXML_Document *in, OUT IXML_Document **out, 
+			  OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceIncreaseBrightness
+ *
+ * Description: 
+ *       Increase brightness.
+ *
+ * Parameters:
+ *
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceIncreaseBrightness(IN IXML_Document *in, OUT IXML_Document **out, 
+			       OUT char **errorString);
+
+/******************************************************************************
+ * TvDeviceDecreaseBrightness
+ *
+ * Description: 
+ *       Decrease brightnesss.
+ *
+ * Parameters:
+ *    IXML_Document * in -  action request document
+ *    IXML_Document **out - action result document
+ *    char **errorString - errorString (in case action was unsuccessful)
+ *
+ *****************************************************************************/
+int TvDeviceDecreaseBrightness(IN IXML_Document *in, OUT IXML_Document **out, 
+			       OUT char **errorString);
+
+int TvDeviceStart(char * ip_address, unsigned short port,char * desc_doc_name,
+				  char *web_dir_path, print_string pfun);
+int TvDeviceStop();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/upnp/sample/web/tvcombodesc.xml
+++ b/upnp/sample/web/tvcombodesc.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<root xmlns="urn:schemas-upnp-org:device-1-0">
+  <specVersion>
+    <major>1</major>
+    <minor>0</minor>
+  </specVersion>
+  <device>
+    <deviceType>urn:schemas-upnp-org:device:tvdevice:1</deviceType>
+    <friendlyName>UPnP Television Emulator</friendlyName>
+    <manufacturer>TV Manufacturer Name</manufacturer>
+    <manufacturerURL>http://www.manufacturer.com</manufacturerURL>
+    <modelDescription>UPnP Television Device Emulator 1.0</modelDescription>
+    <modelName>TVEmulator</modelName>
+    <modelNumber>1.0</modelNumber>
+    <modelURL>http://www.manufacturer.com/TVEmulator/</modelURL>
+    <serialNumber>123456789001</serialNumber>
+    <UDN>uuid:Upnp-TVEmulator-1_0-1234567890002</UDN>
+    <UPC>123456789</UPC>
+    <serviceList>
+      <service>
+        <serviceType>urn:schemas-upnp-org:service:tvcontrol:1</serviceType>
+        <serviceId>urn:upnp-org:serviceId:tvcontrol1</serviceId>
+        <controlURL>/upnp/control/tvcontrol1</controlURL>
+        <eventSubURL>/upnp/event/tvcontrol1</eventSubURL>
+        <SCPDURL>/tvcontrolSCPD.xml</SCPDURL>
+      </service>
+      <service>
+        <serviceType>urn:schemas-upnp-org:service:tvpicture:1</serviceType>
+        <serviceId>urn:upnp-org:serviceId:tvpicture1</serviceId>
+        <controlURL>/upnp/control/tvpicture1</controlURL>
+        <eventSubURL>/upnp/event/tvpicture1</eventSubURL>
+        <SCPDURL>/tvpictureSCPD.xml</SCPDURL>
+      </service>
+    </serviceList>
+   <presentationURL>/tvdevicepres.html</presentationURL>
+</device>
+</root>
--- a/upnp/sample/tvdevice/web/tvcontrolSCPD.xml
+++ b/upnp/sample/tvdevice/web/tvcontrolSCPD.xml
@@ -7,7 +7,6 @@
  </specVersion>


-
  <actionList>

    <action>
@@ -38,6 +37,12 @@
      <name>SetChannel</name>
      <argumentList>

+        <argument>
+        <name>Channel</name>
+          <relatedStateVariable>Channel</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+
        <argument>
         <name>NewChannel</name>
         <retval />
@@ -45,11 +50,6 @@
         <direction>out</direction>
        </argument>

-        <argument>
-        <name>Channel</name>
-          <relatedStateVariable>Channel</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
      </argumentList>
    </action>

@@ -80,6 +80,11 @@
    <action>
      <name>SetVolume</name>
      <argumentList>
+        <argument>
+        <name>Volume</name>
+          <relatedStateVariable>Volume</relatedStateVariable>
+          <direction>in</direction>
+        </argument>

        <argument>
         <name>NewVolume</name>
@@ -87,11 +92,6 @@
         <relatedStateVariable>Volume</relatedStateVariable>
         <direction>out</direction>
         </argument>
-        <argument>
-        <name>Volume</name>
-          <relatedStateVariable>Volume</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
      </argumentList>
    </action>

@@ -124,9 +124,6 @@

  </actionList>

-
-
-
  <serviceStateTable>

    <stateVariable sendEvents="yes">
--- a/upnp/sample/tvdevice/web/tvdevicedesc.xml
+++ b/upnp/sample/tvdevice/web/tvdevicedesc.xml
--- a/upnp/sample/tvdevice/web/tvdevicepres.html
+++ b/upnp/sample/tvdevice/web/tvdevicepres.html
--- a/upnp/sample/tvdevice/web/tvpictureSCPD.xml
+++ b/upnp/sample/tvdevice/web/tvpictureSCPD.xml
@@ -12,6 +12,12 @@
    <action>
      <name>SetColor</name>
      <argumentList>
+        <argument>
+        <name>Color</name>
+          <relatedStateVariable>Color</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+
        <argument>
        <name>NewColor</name>
          <retval />
@@ -19,11 +25,6 @@
          <direction>out</direction>
        </argument>

-        <argument>
-        <name>Color</name>
-          <relatedStateVariable>Color</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
      </argumentList>
    </action>

@@ -54,19 +55,19 @@
    <action>
      <name>SetTint</name>
      <argumentList>
-         <argument>
+        <argument>
+        <name>Tint</name>
+          <relatedStateVariable>Tint</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+        <argument>
        <name>NewTint</name>
          <retval />
          <relatedStateVariable>Tint</relatedStateVariable>
          <direction>out</direction>
        </argument>

-        <argument>
-        <name>Tint</name>
-          <relatedStateVariable>Tint</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
-      </argumentList>
+    </argumentList>
    </action>

    <action>
@@ -96,18 +97,18 @@
    <action>
      <name>SetContrast</name>
      <argumentList>
-        <argument>
+    	<argument>
+        	<name>Contrast</name>
+	          <relatedStateVariable>Contrast</relatedStateVariable>
+    	      <direction>in</direction>
+       	</argument>
+	    <argument>
        <name>NewContrast</name>
          <retval />
          <relatedStateVariable>Contrast</relatedStateVariable>
          <direction>out</direction>
        </argument>  
-        <argument>
-        <name>Contrast</name>
-          <relatedStateVariable>Contrast</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
-      </argumentList>
+    </argumentList>
    </action>

    <action>
@@ -137,19 +138,17 @@
    <action>
      <name>SetBrightness</name>
      <argumentList>
-
+		<argument>
+        <name>Brightness</name>
+          <relatedStateVariable>Brightness</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
         <argument>
        <name>NewBrightness</name>
          <retval />
          <relatedStateVariable>Brightness</relatedStateVariable>
          <direction>out</direction>
        </argument>
-
-        <argument>
-        <name>Brightness</name>
-          <relatedStateVariable>Brightness</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
      </argumentList>
    </action>

@@ -182,7 +181,6 @@
  </actionList>


-
  <serviceStateTable>

    <stateVariable sendEvents="yes">
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
--- a/upnp/src/api/upnpdebug.c
+++ b/upnp/src/api/upnpdebug.c
@@ -88,18 +88,19 @@ UpnpSetLogFileNames ( IN const char *ErrFileName,


 /***************************************************************************
- * Function : UpnpInitLog					
- *									
- * Parameters:	void							
- *						
- * Description:							
+ * Function : UpnpInitLog
+ *
+ * Parameters:	void
+ *
+ * Description:
 *	This functions initializes the log files
+ *
 * Returns: int
 *	-1 : If fails
 *	UPNP_E_SUCCESS : if success
 ***************************************************************************/
 int
-UpnpInitLog(  )
+UpnpInitLog()
 {
    ithread_mutex_init( &GlobalDebugMutex, NULL );

@@ -116,7 +117,7 @@ UpnpInitLog(  )
 /***************************************************************************
 * Function : UpnpSetLogLevel
 *				
- * Parameters:	void
+ * Parameters:	Upnp_LogLevel log_level
 *
 * Description:							
 *	This functions set the log level (see {\tt Upnp_LogLevel}
@@ -139,7 +140,7 @@ UpnpSetLogLevel (Upnp_LogLevel log_level)
 * Returns: void
 ***************************************************************************/
 void
-UpnpCloseLog(  )
+UpnpCloseLog()
 {
    if( DEBUG_TARGET == 1 ) {
        fflush( ErrFileHnd );
@@ -152,11 +153,47 @@ UpnpCloseLog(  )
 }


+/***************************************************************************
+ * Function : DebugAtThisLevel					
+ *									
+ * Parameters:			
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *					
+ * Description:					
+ *	This functions returns true if debug output should be done in this
+ *	module.
+ *
+ * Returns: int
+ ***************************************************************************/
+#ifdef DEBUG
+int DebugAtThisLevel(
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module)
+{
+	int ret = DLevel <= g_log_level;
+	ret &=
+		DEBUG_ALL ||
+		(Module == SSDP  && DEBUG_SSDP ) ||
+		(Module == SOAP  && DEBUG_SOAP ) ||
+		(Module == GENA  && DEBUG_GENA ) ||
+		(Module == TPOOL && DEBUG_TPOOL) ||
+		(Module == MSERV && DEBUG_MSERV) ||
+		(Module == DOM   && DEBUG_DOM  ) ||
+		(Module == HTTP  && DEBUG_HTTP );
+	
+	return ret;
+}
+#endif
+
+
 /***************************************************************************
 * Function : UpnpPrintf					
 *									
 * Parameters:			
- *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
 *		whether debug statement will go to standard output, 
 *		or any of the log files.
 *	IN Dbg_Module Module: debug will go in the name of this module
@@ -173,71 +210,53 @@ UpnpCloseLog(  )
 *	statement is coming
 * Returns: void
 ***************************************************************************/
-DBGONLY( void UpnpPrintf( IN Upnp_LogLevel DLevel,
-                          IN Dbg_Module Module,
-                          IN const char *DbgFileName,
-                          IN int DbgLineNo,
-                          IN const char *FmtStr,
-                          ... ) {
-
-         va_list ArgList;
-         va_start( ArgList, FmtStr );
-         if( g_log_level < DLevel ) return; if( DEBUG_ALL == 0 ) {
-         switch ( Module ) {
-case SSDP:
-         if( DEBUG_SSDP == 1 ) break;
-         else
-return; case SOAP:
-         if( DEBUG_SOAP == 1 ) break;
-         else
-return; case GENA:
-         if( DEBUG_GENA == 1 ) break;
-         else
-return; case TPOOL:
-         if( DEBUG_TPOOL == 1 ) break;
-         else
-return; case MSERV:
-         if( DEBUG_MSERV == 1 ) break;
-         else
-return; case DOM:
-         if( DEBUG_DOM == 1 ) break;
-         else
-return; case HTTP:
-         if( DEBUG_HTTP == 1 ) break;
-         else
-return; case API:
-         if( DEBUG_API == 1 ) break;
-         else
-return; default:
-         return;}
-         }
-
-         ithread_mutex_lock( &GlobalDebugMutex ); if( DEBUG_TARGET == 0 ) {
-         if( DbgFileName ) {
-         UpnpDisplayFileAndLine( stdout, DbgFileName, DbgLineNo );}
-         vfprintf( stdout, FmtStr, ArgList ); fflush( stdout );}
-         else
-         {
-         if( DLevel == 0 ) {
-         if( DbgFileName ) {
-         UpnpDisplayFileAndLine( ErrFileHnd, DbgFileName, DbgLineNo );}
-         vfprintf( ErrFileHnd, FmtStr, ArgList ); fflush( ErrFileHnd );}
-         else
-         {
-         if( DbgFileName ) {
-         UpnpDisplayFileAndLine( InfoFileHnd, DbgFileName, DbgLineNo );}
-         vfprintf( InfoFileHnd, FmtStr, ArgList ); fflush( InfoFileHnd );}
-         }
-         va_end( ArgList ); ithread_mutex_unlock( &GlobalDebugMutex );}
-
- )
+#ifdef DEBUG
+void UpnpPrintf(
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module,
+	IN const char *DbgFileName,
+	IN int DbgLineNo,
+	IN const char *FmtStr,
+	... )
+{
+	va_list ArgList;
+	
+	if (!DebugAtThisLevel(DLevel, Module)) {
+		return;
+	}
+	
+	ithread_mutex_lock(&GlobalDebugMutex);
+	va_start(ArgList, FmtStr);
+	if (!DEBUG_TARGET) {
+		if( DbgFileName ) {
+			UpnpDisplayFileAndLine(stdout, DbgFileName, DbgLineNo);
+		}
+		vfprintf(stdout, FmtStr, ArgList);
+		fflush(stdout);
+	} else if (DLevel == 0) {
+		if (DbgFileName) {
+			UpnpDisplayFileAndLine(ErrFileHnd, DbgFileName, DbgLineNo);
+		}
+		vfprintf(ErrFileHnd, FmtStr, ArgList);
+		fflush(ErrFileHnd);
+	} else {
+		if (DbgFileName) {
+			UpnpDisplayFileAndLine(InfoFileHnd, DbgFileName, DbgLineNo);
+		}
+		vfprintf(InfoFileHnd, FmtStr, ArgList);
+		fflush(InfoFileHnd);
+	}
+	va_end(ArgList);
+	ithread_mutex_unlock(&GlobalDebugMutex);
+}
+#endif


 /***************************************************************************
 * Function : UpnpGetDebugFile					
 *				
 * Parameters:			
- *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
 *		whether debug statement will go to standard output, 
 *		or any of the log files.
 *	IN Dbg_Module Module: debug will go in the name of this module
@@ -249,46 +268,26 @@ return; default:
 *	NULL : if the module is turn off for debug 
 *	else returns the right file descriptor
 ***************************************************************************/
-    DBGONLY( FILE * GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module ) {
-             if( g_log_level < DLevel ) return NULL; if( DEBUG_ALL == 0 ) {
-             switch ( Module ) {
-case SSDP:
-             if( DEBUG_SSDP == 1 ) break;
-             else
-return NULL; case SOAP:
-             if( DEBUG_SOAP == 1 ) break;
-             else
-return NULL; case GENA:
-             if( DEBUG_GENA == 1 ) break;
-             else
-return NULL; case TPOOL:
-             if( DEBUG_TPOOL == 1 ) break;
-             else
-return NULL; case MSERV:
-             if( DEBUG_MSERV == 1 ) break;
-             else
-return NULL; case DOM:
-             if( DEBUG_DOM == 1 ) break;
-             else
-return NULL; case API:
-             if( DEBUG_API == 1 ) break;
-             else
-return NULL; default:
-             return NULL;}
-             }
+#ifdef DEBUG
+FILE *GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module )
+{
+	FILE *ret;

-             if( DEBUG_TARGET == 0 ) {
-             return stdout;}
-             else
-             {
-             if( DLevel == 0 ) {
-             return ErrFileHnd;}
-             else
-             {
-             return InfoFileHnd;}
-             }
-             }
- )
+	if (!DebugAtThisLevel(DLevel, Module)) {
+		ret = NULL;
+	}
+	
+	if (!DEBUG_TARGET) {
+		ret = stdout;
+	} else if (DLevel == 0) {
+		ret = ErrFileHnd;
+	} else {
+		ret = InfoFileHnd;
+	}
+
+	return ret;
+}
+#endif


 /***************************************************************************
@@ -305,17 +304,26 @@ return NULL; default:
 *		debug statement is coming to the log file
 * Returns: void
 ***************************************************************************/
-    DBGONLY( void UpnpDisplayFileAndLine( IN FILE * fd,
-                                          IN const char *DbgFileName,
-                                          IN int DbgLineNo ) {
-             int starlength = 66;
-             const char *lines[2];
-             char FileAndLine[500]; lines[0] = "DEBUG"; if( DbgFileName ) {
-             sprintf( FileAndLine, "FILE: %s, LINE: %d", DbgFileName,
-                      DbgLineNo ); lines[1] = FileAndLine;}
-
-             UpnpDisplayBanner( fd, lines, 2, starlength ); fflush( fd );}
- )
+#ifdef DEBUG
+void UpnpDisplayFileAndLine(
+	IN FILE * fd,
+	IN const char *DbgFileName,
+	IN int DbgLineNo)
+{
+	int starlength = 66;
+	const char *lines[2];
+	char FileAndLine[500];
+	lines[0] = "DEBUG";
+	if (DbgFileName) {
+		sprintf(FileAndLine,
+			"FILE: %s, LINE: %d",
+			DbgFileName, DbgLineNo);
+		lines[1] = FileAndLine;
+	}
+	UpnpDisplayBanner(fd, lines, 2, starlength);
+	fflush(fd);
+}
+#endif


 /***************************************************************************
@@ -332,47 +340,58 @@ return NULL; default:
 *	per the requested banner
 * Returns: void
 ***************************************************************************/
-    DBGONLY( void UpnpDisplayBanner( IN FILE * fd,
-                                     IN const char **lines,
-                                     IN size_t size,
-                                     IN int starLength ) {
-             char *stars = ( char * )malloc( starLength + 1 );
-             const char *line = NULL;
-             int leftMarginLength = starLength / 2 + 1;
-             int rightMarginLength = starLength / 2 + 1;
-             char *leftMargin = ( char * )malloc( leftMarginLength );
-             char *rightMargin = ( char * )malloc( rightMarginLength );
-             int i = 0;
-             int LineSize = 0;
-             char *currentLine = ( char * )malloc( starLength + 1 );
-             memset( stars, '*', starLength );
-             stars[starLength] = 0;
-             memset( leftMargin, 0, leftMarginLength );
-             memset( rightMargin, 0, rightMarginLength );
-             fprintf( fd, "\n%s\n", stars ); for( i = 0; i < size; i++ ) {
-             LineSize = strlen( lines[i] );
-             line = lines[i]; while( LineSize > ( starLength - 2 ) ) {
-             memcpy( currentLine, line, ( starLength - 2 ) );
-             currentLine[( starLength - 2 )] = 0;
-             fprintf( fd, "*%s*\n", currentLine );
-             LineSize -= ( starLength - 2 ); line += ( starLength - 2 );}
+#ifdef DEBUG
+void UpnpDisplayBanner(
+	IN FILE * fd,
+	IN const char **lines,
+	IN size_t size,
+	IN int starLength)
+{
+	int leftMarginLength = starLength / 2 + 1;
+	int rightMarginLength = starLength / 2 + 1;
+	int i = 0;
+	int LineSize = 0;
+	int starLengthMinus2 = starLength - 2;

-             if( LineSize % 2 == 0 ) {
-             leftMarginLength = rightMarginLength =
-             ( ( starLength - 2 ) - LineSize ) / 2;}
-             else
-             {
-             leftMarginLength = ( ( starLength - 2 ) - LineSize ) / 2;
-             rightMarginLength =
-             ( ( starLength - 2 ) - LineSize ) / 2 + 1;}
+	char *leftMargin = ( char * )malloc( leftMarginLength );
+	char *rightMargin = ( char * )malloc( rightMarginLength );
+	char *stars = ( char * )malloc( starLength + 1 );
+	char *currentLine = ( char * )malloc( starLength + 1 );
+	const char *line = NULL;

-             memset( leftMargin, ' ', leftMarginLength );
-             memset( rightMargin, ' ', rightMarginLength );
-             leftMargin[leftMarginLength] = 0;
-             rightMargin[rightMarginLength] = 0;
-             fprintf( fd, "*%s%s%s*\n", leftMargin, line, rightMargin );}
+	memset( stars, '*', starLength );
+	stars[starLength] = 0;
+	memset( leftMargin, 0, leftMarginLength );
+	memset( rightMargin, 0, rightMarginLength );
+	fprintf( fd, "\n%s\n", stars );
+	for( i = 0; i < size; i++ ) {
+		LineSize = strlen( lines[i] );
+		line = lines[i];
+		while( LineSize > starLengthMinus2 ) {
+			memcpy( currentLine, line, starLengthMinus2 );
+			currentLine[starLengthMinus2] = 0;
+			fprintf( fd, "*%s*\n", currentLine );
+			LineSize -= starLengthMinus2;
+			line += starLengthMinus2;
+		}
+		leftMarginLength = (starLengthMinus2 - LineSize)/2;
+		if( LineSize % 2 == 0 ) {
+			rightMarginLength = leftMarginLength;
+		} else {
+			rightMarginLength = leftMarginLength + 1;
+		}
+		memset( leftMargin, ' ', leftMarginLength );
+		memset( rightMargin, ' ', rightMarginLength );
+		leftMargin[leftMarginLength] = 0;
+		rightMargin[rightMarginLength] = 0;
+		fprintf( fd, "*%s%s%s*\n", leftMargin, line, rightMargin );
+	}
+	fprintf( fd, "%s\n\n", stars );

-             fprintf( fd, "%s\n\n", stars );
-             free( leftMargin );
-             free( rightMargin ); free( stars ); free( currentLine );}
- )
+	free( currentLine );
+	free( stars );
+	free( rightMargin );
+	free( leftMargin );
+}
+#endif
+ 
--- a/upnp/src/api/upnptools.c
+++ b/upnp/src/api/upnptools.c
@@ -256,8 +256,8 @@ makeAction( IN int response,
            IN const char *Arg,
            IN va_list ArgList )
 {
-    const char *ArgName,
-     *ArgValue;
+    const char *ArgName;
+    const char *ArgValue;
    char *ActBuff;
    int Idx = 0;
    IXML_Document *ActionDoc;
@@ -298,7 +298,7 @@ makeAction( IN int response,
    if( NumArg > 0 ) {
        //va_start(ArgList, Arg);
        ArgName = Arg;
-        while( Idx++ != NumArg ) {
+        for ( ; ; ) {
            ArgValue = va_arg( ArgList, const char * );

            if( ArgName != NULL ) {
@@ -313,7 +313,11 @@ makeAction( IN int response,
                ixmlNode_appendChild( node, ( IXML_Node * ) Ele );
            }

-            ArgName = va_arg( ArgList, const char * );
+            if (++Idx < NumArg) {
+                ArgName = va_arg( ArgList, const char * );
+            } else {
+                break;
+            }
        }
        //va_end(ArgList);
    }
--- a/upnp/src/gena/gena_callback2.c
+++ b/upnp/src/gena/gena_callback2.c
@@ -93,37 +93,35 @@ genaCallback( IN http_parser_t * parser,
    xboolean found_function = FALSE;

    if( request->method == HTTPMETHOD_SUBSCRIBE ) {
-        DEVICEONLY( found_function = TRUE;
-                    if( httpmsg_find_hdr( request, HDR_NT, NULL ) == NULL )
-                    {
-                    // renew subscription
-                    gena_process_subscription_renewal_request
-                    ( info, request );}
-                    else
-                    {
-                    // subscribe
-                    gena_process_subscription_request( info, request );}
+#ifdef INCLUDE_DEVICE_APIS
+        found_function = TRUE;
+        if( httpmsg_find_hdr( request, HDR_NT, NULL ) == NULL ) {
+            // renew subscription
+            gena_process_subscription_renewal_request
+            ( info, request );
+	} else {
+            // subscribe
+            gena_process_subscription_request( info, request );
+	}
+        UpnpPrintf( UPNP_ALL, GENA, __FILE__, __LINE__,
+            "got subscription request\n" );
+    } else if( request->method == HTTPMETHOD_UNSUBSCRIBE ) {
+        found_function = TRUE;
+        // unsubscribe
+        gena_process_unsubscribe_request( info, request );
+#endif
+    } else if( request->method == HTTPMETHOD_NOTIFY ) {
+#ifdef INCLUDE_CLIENT_APIS
+        found_function = TRUE;
+        // notify
+        gena_process_notification_event( info, request );
+#endif
+    }

-                    DBGONLY( UpnpPrintf
-                             ( UPNP_ALL, GENA, __FILE__, __LINE__,
-                               "got subscription request\n" ); )
-             )
-            }
-            else
-        if( request->method == HTTPMETHOD_UNSUBSCRIBE ) {
-            DEVICEONLY( found_function = TRUE;
-                        // unsubscribe
-                        gena_process_unsubscribe_request( info,
-                                                          request ); )
-        } else if( request->method == HTTPMETHOD_NOTIFY ) {
-            CLIENTONLY( found_function = TRUE;
-                        // notify
-                        gena_process_notification_event( info, request ); )
-        }
-
-        if( !found_function ) {
+    if( !found_function ) {
            // handle missing functions of device or ctrl pt
            error_respond( info, HTTP_NOT_IMPLEMENTED, request );
-        }
    }
+}
 #endif // EXCLUDE_GENA
+
--- a/upnp/src/gena/gena_ctrlpt.c
+++ b/upnp/src/gena/gena_ctrlpt.c
@@ -72,14 +72,14 @@ GenaAutoRenewSubscription( IN void *input )
    int eventType = 0;

    if( AUTO_RENEW_TIME == 0 ) {
-        DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                             "GENA SUB EXPIRED" ) );
+        UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+            "GENA SUB EXPIRED" );
        sub_struct->ErrCode = UPNP_E_SUCCESS;
        send_callback = 1;
        eventType = UPNP_EVENT_SUBSCRIPTION_EXPIRED;
    } else {
-        DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                             "GENA AUTO RENEW" ) );
+        UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+            "GENA AUTO RENEW" );
        if( ( ( sub_struct->ErrCode = genaRenewSubscription( event->handle,
                                                             sub_struct->
                                                             Sid,
@@ -93,17 +93,17 @@ GenaAutoRenewSubscription( IN void *input )
        }
    }
    if( send_callback ) {
-        HandleLock(  );
+        HandleLock();
        if( GetHandleInfo( event->handle, &handle_info ) != HND_CLIENT ) {
-            HandleUnlock(  );
+            HandleUnlock();
            free_upnp_timeout( event );
            return;
        }
-        DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                             "HANDLE IS VALID" ) );
+        UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+            "HANDLE IS VALID" );
        callback_fun = handle_info->Callback;
        cookie = handle_info->Cookie;
-        HandleUnlock(  );
+        HandleUnlock();
        //make callback

        callback_fun( eventType, event->Event, cookie );
@@ -397,9 +397,9 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
    http_parser_t response;

    while( TRUE ) {
-        HandleLock(  );
+        HandleLock();
        if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-            HandleUnlock(  );
+            HandleUnlock();
            return GENA_E_BAD_HANDLE;
        }

@@ -417,7 +417,7 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
        RemoveClientSubClientSID( &handle_info->ClientSubList,
                                  sub_copy.sid );

-        HandleUnlock(  );
+        HandleUnlock();

        return_code = gena_unsubscribe( sub_copy.EventURL,
                                        sub_copy.ActualSID, &response );
@@ -429,7 +429,7 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
    }

    freeClientSubList( handle_info->ClientSubList );
-    HandleUnlock(  );
+    HandleUnlock();
    return return_code;
 }

@@ -449,6 +449,7 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
+#ifdef INCLUDE_CLIENT_APIS
 int
 genaUnSubscribe( IN UpnpClient_Handle client_handle,
                 IN const Upnp_SID in_sid )
@@ -459,25 +460,25 @@ genaUnSubscribe( IN UpnpClient_Handle client_handle,
    client_subscription sub_copy;
    http_parser_t response;

-    HandleLock(  );
+    HandleLock();

    // validate handle and sid

    if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_HANDLE;
    }

    if( ( sub =
          GetClientSubClientSID( handle_info->ClientSubList, in_sid ) )
        == NULL ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_SID;
    }

    return_code = copy_client_subscription( sub, &sub_copy );

-    HandleUnlock(  );
+    HandleUnlock();

    return_code = gena_unsubscribe( sub_copy.EventURL, sub_copy.ActualSID,
                                    &response );
@@ -488,19 +489,20 @@ genaUnSubscribe( IN UpnpClient_Handle client_handle,

    free_client_subscription( &sub_copy );

-    HandleLock(  );
+    HandleLock();

    if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_HANDLE;
    }

    RemoveClientSubClientSID( &handle_info->ClientSubList, in_sid );

-    HandleUnlock(  );
+    HandleUnlock();

    return return_code;
 }
+#endif

 /************************************************************************
 * Function : genaSubscribe
@@ -524,6 +526,7 @@ genaUnSubscribe( IN UpnpClient_Handle client_handle,
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
+#ifdef INCLUDE_CLIENT_APIS
 int
 genaSubscribe( IN UpnpClient_Handle client_handle,
               IN char *PublisherURL,
@@ -538,28 +541,28 @@ genaSubscribe( IN UpnpClient_Handle client_handle,
    struct Handle_Info *handle_info;
    char *EventURL = NULL;

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "GENA SUBSCRIBE BEGIN" ) );
-    HandleLock(  );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "GENA SUBSCRIBE BEGIN" );
+    HandleLock();

    memset( out_sid, 0, sizeof( Upnp_SID ) );

    // validate handle
    if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_HANDLE;
    }
-    HandleUnlock(  );
+    HandleUnlock();

    // subscribe
-    SubscribeLock(  );
+    SubscribeLock();
    return_code =
        gena_subscribe( PublisherURL, TimeOut, NULL, &ActualSID );
-    HandleLock(  );
+    HandleLock();
    if( return_code != UPNP_E_SUCCESS ) {
-        DBGONLY( UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
-                             "SUBSCRIBE FAILED in transfer error code: %d returned\n",
-                             return_code ) );
+        UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
+            "SUBSCRIBE FAILED in transfer error code: %d returned\n",
+            return_code );
        goto error_handler;
    }

@@ -605,10 +608,11 @@ genaSubscribe( IN UpnpClient_Handle client_handle,
        free( EventURL );
        free( newSubscription );
    }
-    HandleUnlock(  );
-    SubscribeUnlock(  );
+    HandleUnlock();
+    SubscribeUnlock();
    return return_code;
 }
+#endif

 /************************************************************************
 * Function : genaRenewSubscription
@@ -643,17 +647,17 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
    char *ActualSID;
    ThreadPoolJob tempJob;

-    HandleLock(  );
+    HandleLock();

    // validate handle and sid
    if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_HANDLE;
    }

    if( ( sub = GetClientSubClientSID( handle_info->ClientSubList,
                                       in_sid ) ) == NULL ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_SID;
    }
    // remove old events
@@ -663,13 +667,13 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
        free_upnp_timeout( ( upnp_timeout * ) tempJob.arg );
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "REMOVED AUTO RENEW  EVENT" ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "REMOVED AUTO RENEW  EVENT" );

    sub->RenewEventId = -1;
    return_code = copy_client_subscription( sub, &sub_copy );

-    HandleUnlock(  );
+    HandleUnlock();

    if( return_code != HTTP_SUCCESS ) {
        return return_code;
@@ -677,10 +681,10 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,

    return_code = gena_subscribe( sub_copy.EventURL, TimeOut,
                                  sub_copy.ActualSID, &ActualSID );
-    HandleLock(  );
+    HandleLock();

    if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock(  );
+        HandleUnlock();
        if( return_code == UPNP_E_SUCCESS ) {
            free( ActualSID );
        }
@@ -693,7 +697,7 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
        // network failure (remove client sub)
        RemoveClientSubClientSID( &handle_info->ClientSubList, in_sid );
        free_client_subscription( &sub_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return return_code;
    }
    // get subscription
@@ -701,7 +705,7 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
                                       in_sid ) ) == NULL ) {
        free( ActualSID );
        free_client_subscription( &sub_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_SID;
    }
    // store actual sid
@@ -714,7 +718,7 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
        RemoveClientSubClientSID( &handle_info->ClientSubList, sub->sid );
    }
    free_client_subscription( &sub_copy );
-    HandleUnlock(  );
+    HandleUnlock();
    return return_code;
 }

@@ -795,12 +799,12 @@ gena_process_notification_event( IN SOCKINFO * info,
        return;
    }

-    HandleLock(  );
+    HandleLock();

    // get client info
    if( GetClientHandleInfo( &client_handle, &handle_info ) != HND_CLIENT ) {
        error_respond( info, HTTP_PRECONDITION_FAILED, event );
-        HandleUnlock(  );
+        HandleUnlock();
        ixmlDocument_free( ChangedVars );

        return;
@@ -813,20 +817,20 @@ gena_process_notification_event( IN SOCKINFO * info,
            //   (if we are in the middle)
            // this is to avoid mistakenly rejecting the first event if we 
            //   receive it before the subscription response
-            HandleUnlock(  );
+            HandleUnlock();

            // try and get Subscription Lock 
            //   (in case we are in the process of subscribing)
-            SubscribeLock(  );
+            SubscribeLock();

            // get HandleLock again
-            HandleLock(  );
+            HandleLock();

            if( GetClientHandleInfo( &client_handle, &handle_info )
                != HND_CLIENT ) {
                error_respond( info, HTTP_PRECONDITION_FAILED, event );
-                SubscribeUnlock(  );
-                HandleUnlock(  );
+                SubscribeUnlock();
+                HandleUnlock();
                ixmlDocument_free( ChangedVars );

                return;
@@ -836,17 +840,17 @@ gena_process_notification_event( IN SOCKINFO * info,
                  GetClientSubActualSID( handle_info->ClientSubList,
                                         &sid ) ) == NULL ) {
                error_respond( info, HTTP_PRECONDITION_FAILED, event );
-                SubscribeUnlock(  );
-                HandleUnlock(  );
+                SubscribeUnlock();
+                HandleUnlock();
                ixmlDocument_free( ChangedVars );

                return;
            }

-            SubscribeUnlock(  );
+            SubscribeUnlock();
        } else {
            error_respond( info, HTTP_PRECONDITION_FAILED, event );
-            HandleUnlock(  );
+            HandleUnlock();
            ixmlDocument_free( ChangedVars );

            return;
@@ -864,7 +868,7 @@ gena_process_notification_event( IN SOCKINFO * info,
    callback = handle_info->Callback;
    cookie = handle_info->Cookie;

-    HandleUnlock(  );
+    HandleUnlock();

    // make callback with event struct
    // In future, should find a way of mainting
--- a/upnp/src/gena/gena_device.c
+++ b/upnp/src/gena/gena_device.c
@@ -62,19 +62,19 @@ genaUnregisterDevice( IN UpnpDevice_Handle device_handle )
 {
    struct Handle_Info *handle_info;

-    HandleLock(  );
+    HandleLock();
    if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {

-        DBGONLY( UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
-                             "genaUnregisterDevice : BAD Handle : %d\n",
-                             device_handle ) );
+        UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
+            "genaUnregisterDevice : BAD Handle : %d\n",
+            device_handle );

-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_HANDLE;
    }

    freeServiceTable( &handle_info->ServiceTable );
-    HandleUnlock(  );
+    HandleUnlock();

    return UPNP_E_SUCCESS;
 }
@@ -188,7 +188,7 @@ free_notify_struct( IN notify_thread_struct * input )
 *
 *	Note : called by genaNotify
 ****************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 notify_send_and_recv( IN uri_type * destination_url,
                      IN membuffer * mid_msg,
                      IN char *propertySet,
@@ -203,12 +203,12 @@ notify_send_and_recv( IN uri_type * destination_url,
    SOCKINFO info;

    // connect
-    DBGONLY( UpnpPrintf( UPNP_ALL, GENA, __FILE__, __LINE__,
-                         "gena notify to: %.*s\n",
-                         destination_url->hostport.text.size,
-                         destination_url->hostport.text.buff ); )
+    UpnpPrintf( UPNP_ALL, GENA, __FILE__, __LINE__,
+        "gena notify to: %.*s\n",
+        (int)destination_url->hostport.text.size,
+        destination_url->hostport.text.buff );

-        conn_fd = http_Connect( destination_url, &url );
+    conn_fd = http_Connect( destination_url, &url );
    if( conn_fd < 0 ) {
        return conn_fd;         // return UPNP error
    }
@@ -365,12 +365,12 @@ genaNotifyThread( IN void *input )
    struct Handle_Info *handle_info;
    ThreadPoolJob job;

-    HandleLock(  );
+    HandleLock();
    //validate context

    if( GetHandleInfo( in->device_handle, &handle_info ) != HND_DEVICE ) {
        free_notify_struct( in );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }

@@ -380,7 +380,7 @@ genaNotifyThread( IN void *input )
        || ( ( sub = GetSubscriptionSID( in->sid, service ) ) == NULL )
        || ( ( copy_subscription( sub, &sub_copy ) != HTTP_SUCCESS ) ) ) {
        free_notify_struct( in );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    //If the event is out of order push it back to the job queue
@@ -392,22 +392,22 @@ genaNotifyThread( IN void *input )
        ThreadPoolAdd( &gSendThreadPool, &job, NULL );

        freeSubscription( &sub_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }

-    HandleUnlock(  );
+    HandleUnlock();

    //send the notify
    return_code = genaNotify( in->headers, in->propertySet, &sub_copy );

    freeSubscription( &sub_copy );

-    HandleLock(  );
+    HandleLock();

    if( GetHandleInfo( in->device_handle, &handle_info ) != HND_DEVICE ) {
        free_notify_struct( in );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    //validate context
@@ -416,7 +416,7 @@ genaNotifyThread( IN void *input )
        || ( !service->active )
        || ( ( sub = GetSubscriptionSID( in->sid, service ) ) == NULL ) ) {
        free_notify_struct( in );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }

@@ -430,7 +430,7 @@ genaNotifyThread( IN void *input )
    }

    free_notify_struct( in );
-    HandleUnlock(  );
+    HandleUnlock();
 }

 /****************************************************************************
@@ -477,8 +477,8 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,

    notify_thread_struct *thread_struct = NULL;

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "GENA BEGIN INITIAL NOTIFY " ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "GENA BEGIN INITIAL NOTIFY " );

    reference_count = ( int * )malloc( sizeof( int ) );

@@ -504,13 +504,13 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
    strcpy( UDN_copy, UDN );
    strcpy( servId_copy, servId );

-    HandleLock(  );
+    HandleLock();

    if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_HANDLE;
    }

@@ -519,26 +519,25 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_SERVICE;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "FOUND SERVICE IN INIT NOTFY: UDN %s, ServID: %s ",
-                         UDN, servId ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "FOUND SERVICE IN INIT NOTFY: UDN %s, ServID: %s ",
+        UDN, servId );

    if( ( ( sub = GetSubscriptionSID( sid, service ) ) == NULL ) ||
        ( sub->active ) ) {
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_SID;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "FOUND SUBSCRIPTION IN INIT NOTIFY: SID %s ",
-                         sid ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "FOUND SUBSCRIPTION IN INIT NOTIFY: SID %s ", sid );

    sub->active = 1;

@@ -549,13 +548,13 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return return_code;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "GENERATED PROPERY SET IN INIT NOTIFY: \n'%s'\n",
-                         propertySet ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "GENERATED PROPERY SET IN INIT NOTIFY: \n'%s'\n",
+        propertySet );

    headers_size = strlen( "CONTENT-TYPE text/xml\r\n" ) +
        strlen( "CONTENT-LENGTH: \r\n" ) + MAX_CONTENT_LENGTH +
@@ -569,12 +568,12 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
        free( UDN_copy );
        free( servId_copy );
        free( reference_count );
-        HandleUnlock(  );
+        HandleUnlock();
        return UPNP_E_OUTOF_MEMORY;
    }

    sprintf( headers, "CONTENT-TYPE: text/xml\r\nCONTENT-LENGTH: "
-             "%zd\r\nNT: upnp:event\r\nNTS: upnp:propchange\r\n",
+             "%"PRIzu"\r\nNT: upnp:event\r\nNTS: upnp:propchange\r\n",
             strlen( propertySet ) + 1 );

    //schedule thread for initial notification
@@ -621,7 +620,7 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
        free( headers );
    }

-    HandleUnlock(  );
+    HandleUnlock();

    return return_code;
 }
@@ -668,8 +667,8 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,

    notify_thread_struct *thread_struct = NULL;

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "GENA BEGIN INITIAL NOTIFY EXT" ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "GENA BEGIN INITIAL NOTIFY EXT" );
    reference_count = ( int * )malloc( sizeof( int ) );

    if( reference_count == NULL ) {
@@ -694,13 +693,13 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
    strcpy( UDN_copy, UDN );
    strcpy( servId_copy, servId );

-    HandleLock(  );
+    HandleLock();

    if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_HANDLE;
    }

@@ -709,24 +708,23 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_SERVICE;
    }
-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "FOUND SERVICE IN INIT NOTFY EXT: UDN %s, ServID: %s\n",
-                         UDN, servId ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "FOUND SERVICE IN INIT NOTFY EXT: UDN %s, ServID: %s\n",
+        UDN, servId );

    if( ( ( sub = GetSubscriptionSID( sid, service ) ) == NULL ) ||
        ( sub->active ) ) {
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return GENA_E_BAD_SID;
    }
-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "FOUND SUBSCRIPTION IN INIT NOTIFY EXT: SID %s",
-                         sid ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "FOUND SUBSCRIPTION IN INIT NOTIFY EXT: SID %s", sid );

    sub->active = 1;

@@ -735,13 +733,13 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
        free( UDN_copy );
        free( reference_count );
        free( servId_copy );
-        HandleUnlock(  );
+        HandleUnlock();
        return UPNP_E_INVALID_PARAM;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "GENERATED PROPERY SET IN INIT EXT NOTIFY: %s",
-                         propertySet ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "GENERATED PROPERY SET IN INIT EXT NOTIFY: %s",
+        propertySet );

    headers_size = strlen( "CONTENT-TYPE text/xml\r\n" ) +
        strlen( "CONTENT-LENGTH: \r\n" ) + MAX_CONTENT_LENGTH +
@@ -754,7 +752,7 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
        free( servId_copy );
        free( reference_count );
        ixmlFreeDOMString( propertySet );
-        HandleUnlock(  );
+        HandleUnlock();
        return UPNP_E_OUTOF_MEMORY;
    }

@@ -804,7 +802,7 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
        free( thread_struct );
        free( headers );
    }
-    HandleUnlock(  );
+    HandleUnlock();

    return return_code;
 }
@@ -899,7 +897,7 @@ genaNotifyAllExt( IN UpnpDevice_Handle device_handle,
             "%ld\r\nNT: upnp:event\r\nNTS: upnp:propchange\r\n",
             (long) strlen( propertySet ) + 1 );

-    HandleLock(  );
+    HandleLock();

    if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE )
        return_code = GENA_E_BAD_HANDLE;
@@ -959,7 +957,7 @@ genaNotifyAllExt( IN UpnpDevice_Handle device_handle,
        free( servId_copy );
    }

-    HandleUnlock(  );
+    HandleUnlock();

    return return_code;
 }
@@ -1061,7 +1059,7 @@ genaNotifyAll( IN UpnpDevice_Handle device_handle,
             " upnp:event\r\nNTS: upnp:propchange\r\n",
             (long) strlen( propertySet ) + 1 );

-    HandleLock(  );
+    HandleLock();

    if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {
        return_code = GENA_E_BAD_HANDLE;
@@ -1123,7 +1121,7 @@ genaNotifyAll( IN UpnpDevice_Handle device_handle,
        free( UDN_copy );
        free( servId_copy );
    }
-    HandleUnlock(  );
+    HandleUnlock();

    return return_code;
 }
@@ -1317,8 +1315,8 @@ gena_process_subscription_request( IN SOCKINFO * info,
    memptr callback_hdr;
    memptr timeout_hdr;

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "Subscription Request Received:\n" ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "Subscription Request Received:\n" );

    if( httpmsg_find_hdr( request, HDR_NT, &nt_hdr ) == NULL ) {
        error_respond( info, HTTP_BAD_REQUEST, request );
@@ -1347,18 +1345,17 @@ gena_process_subscription_request( IN SOCKINFO * info,
        return;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "SubscriptionRequest for event URL path: %s\n",
-                         event_url_path );
-         )
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "SubscriptionRequest for event URL path: %s\n",
+        event_url_path );

-        HandleLock(  );
+    HandleLock();

    // CURRENTLY, ONLY ONE DEVICE
    if( GetDeviceHandleInfo( &device_handle, &handle_info ) != HND_DEVICE ) {
        free( event_url_path );
        error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    service = FindServiceEventURLPath( &handle_info->ServiceTable,
@@ -1367,28 +1364,28 @@ gena_process_subscription_request( IN SOCKINFO * info,

    if( service == NULL || !service->active ) {
        error_respond( info, HTTP_NOT_FOUND, request );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "Subscription Request: Number of Subscriptions already %d\n "
-                         "Max Subscriptions allowed: %d\n",
-                         service->TotalSubscriptions,
-                         handle_info->MaxSubscriptions ) );
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "Subscription Request: Number of Subscriptions already %d\n "
+        "Max Subscriptions allowed: %d\n",
+        service->TotalSubscriptions,
+        handle_info->MaxSubscriptions );

    // too many subscriptions
    if( handle_info->MaxSubscriptions != -1 &&
        service->TotalSubscriptions >= handle_info->MaxSubscriptions ) {
        error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    // generate new subscription
    sub = ( subscription * ) malloc( sizeof( subscription ) );
    if( sub == NULL ) {
        error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    sub->eventKey = 0;
@@ -1405,13 +1402,13 @@ gena_process_subscription_request( IN SOCKINFO * info,
                                         &sub->DeliveryURLs ) ) == 0 ) {
        error_respond( info, HTTP_PRECONDITION_FAILED, request );
        freeSubscriptionList( sub );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    if( return_code == UPNP_E_OUTOF_MEMORY ) {
        error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
        freeSubscriptionList( sub );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    // set the timeout
@@ -1447,7 +1444,7 @@ gena_process_subscription_request( IN SOCKINFO * info,
    // respond OK
    if( respond_ok( info, time_out, sub, request ) != UPNP_E_SUCCESS ) {
        freeSubscriptionList( sub );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    //add to subscription list
@@ -1464,7 +1461,7 @@ gena_process_subscription_request( IN SOCKINFO * info,
    callback_fun = handle_info->Callback;
    cookie = handle_info->Cookie;

-    HandleUnlock(  );
+    HandleUnlock();

    //make call back with request struct
    //in the future should find a way of mainting
@@ -1527,7 +1524,7 @@ gena_process_subscription_renewal_request( IN SOCKINFO * info,
        return;
    }

-    HandleLock(  );
+    HandleLock();

    // CURRENTLY, ONLY SUPPORT ONE DEVICE
    if( GetDeviceHandleInfo( &device_handle, &handle_info ) != HND_DEVICE ) {
@@ -1544,22 +1541,21 @@ gena_process_subscription_renewal_request( IN SOCKINFO * info,
        !service->active ||
        ( ( sub = GetSubscriptionSID( sid, service ) ) == NULL ) ) {
        error_respond( info, HTTP_PRECONDITION_FAILED, request );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-                         "Renew request: Number of subscriptions already: %d\n "
-                         "Max Subscriptions allowed:%d\n",
-                         service->TotalSubscriptions,
-                         handle_info->MaxSubscriptions );
-         )
-        // too many subscriptions
-        if( handle_info->MaxSubscriptions != -1 &&
+    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        "Renew request: Number of subscriptions already: %d\n "
+        "Max Subscriptions allowed:%d\n",
+        service->TotalSubscriptions,
+        handle_info->MaxSubscriptions );
+    // too many subscriptions
+    if( handle_info->MaxSubscriptions != -1 &&
            service->TotalSubscriptions > handle_info->MaxSubscriptions ) {
        error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
        RemoveSubscriptionSID( sub->sid, service );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    // set the timeout
@@ -1598,7 +1594,7 @@ gena_process_subscription_renewal_request( IN SOCKINFO * info,
        RemoveSubscriptionSID( sub->sid, service );
    }

-    HandleUnlock(  );
+    HandleUnlock();
 }

 /****************************************************************************
@@ -1651,13 +1647,13 @@ gena_process_unsubscribe_request( IN SOCKINFO * info,
        return;
    }

-    HandleLock(  );
+    HandleLock();

    // CURRENTLY, ONLY SUPPORT ONE DEVICE
    if( GetDeviceHandleInfo( &device_handle, &handle_info ) != HND_DEVICE ) {
        error_respond( info, HTTP_PRECONDITION_FAILED, request );
        membuffer_destroy( &event_url_path );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    service = FindServiceEventURLPath( &handle_info->ServiceTable,
@@ -1670,14 +1666,14 @@ gena_process_unsubscribe_request( IN SOCKINFO * info,
        //CheckSubscriptionSID(sid, service) == NULL )
    {
        error_respond( info, HTTP_PRECONDITION_FAILED, request );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }

    RemoveSubscriptionSID( sid, service );
    error_respond( info, HTTP_OK, request );    // success

-    HandleUnlock(  );
+    HandleUnlock();
 }

 #endif // INCLUDE_DEVICE_APIS
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -106,16 +106,16 @@ SetHTTPGetCallback( MiniServerCallback callback )
 }

 /************************************************************************
-*	Function :	SetSoapCallback
+* Function :	SetSoapCallback
 *
-*	Parameters :
-*		MiniServerCallback callback ; - SOAP Callback to be invoked 
+* Parameters :
+*	MiniServerCallback callback ; - SOAP Callback to be invoked 
 *
-*	Description :	Set SOAP Callback
+* Description :	Set SOAP Callback
 *
-*	Return :	void
+* Return :	void
 *
-*	Note :
+* Note :
 ************************************************************************/
 void
 SetSoapCallback( MiniServerCallback callback )
@@ -174,11 +174,9 @@ dispatch_request( IN SOCKINFO * info,
        case HTTPMETHOD_NOTIFY:
        case HTTPMETHOD_SUBSCRIBE:
        case HTTPMETHOD_UNSUBSCRIBE:
-            DBGONLY( UpnpPrintf
-                     ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                       "miniserver %d: got GENA msg\n", info->socket );
-                 )
-                callback = gGenaCallback;
+            UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+                "miniserver %d: got GENA msg\n", info->socket );
+            callback = gGenaCallback;
            break;

            //HTTP server call
@@ -217,7 +215,7 @@ dispatch_request( IN SOCKINFO * info,
 *
 *	Note :
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 handle_error( IN SOCKINFO * info,
              int http_error_code,
              int major,
@@ -275,12 +273,10 @@ handle_request( void *args )
    struct mserv_request_t *request = ( struct mserv_request_t * )args;
    int connfd = request->connfd;

-    DBGONLY( UpnpPrintf
-             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-               "miniserver %d: READING\n", connfd );
-         )
-        //parser_request_init( &parser ); ////LEAK_FIX_MK
-        hmsg = &parser.msg;
+    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        "miniserver %d: READING\n", connfd );
+    //parser_request_init( &parser ); ////LEAK_FIX_MK
+    hmsg = &parser.msg;

    if( sock_init_with_ip( &info, connfd, request->foreign_ip_addr,
                           request->foreign_ip_port ) != UPNP_E_SUCCESS ) {
@@ -295,12 +291,10 @@ handle_request( void *args )
        goto error_handler;
    }

-    DBGONLY( UpnpPrintf
-             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-               "miniserver %d: PROCESSING...\n", connfd );
-         )
-        // dispatch
-        http_error_code = dispatch_request( &info, &parser );
+    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        "miniserver %d: PROCESSING...\n", connfd );
+    // dispatch
+    http_error_code = dispatch_request( &info, &parser );
    if( http_error_code != 0 ) {
        goto error_handler;
    }
@@ -316,11 +310,9 @@ handle_request( void *args )
        handle_error( &info, http_error_code, major, minor );
    }

-    DBGONLY( UpnpPrintf
-             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-               "miniserver %d: COMPLETE\n", connfd );
-         )
-        sock_destroy( &info, SD_BOTH ); //should shutdown completely
+    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        "miniserver %d: COMPLETE\n", connfd );
+    sock_destroy( &info, SD_BOTH ); //should shutdown completely

    httpmsg_destroy( hmsg );
    free( request );
@@ -341,7 +333,7 @@ handle_request( void *args )
 *
 *	Note :
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 schedule_request_job( IN int connfd,
                      IN struct sockaddr_in *clientAddr )
 {
@@ -352,11 +344,9 @@ schedule_request_job( IN int connfd,
        ( struct mserv_request_t * )
        malloc( sizeof( struct mserv_request_t ) );
    if( request == NULL ) {
-        DBGONLY( UpnpPrintf
-                 ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                   "mserv %d: out of memory\n", connfd );
-             )
-            shutdown( request->connfd, SD_BOTH );
+        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+            "mserv %d: out of memory\n", connfd );
+        shutdown( request->connfd, SD_BOTH );
        UpnpCloseSocket( connfd );
        return;
    }
@@ -369,11 +359,9 @@ schedule_request_job( IN int connfd,
    TPJobSetFreeFunction( &job, free_handle_request_arg );
    TPJobSetPriority( &job, MED_PRIORITY );

-    if( ThreadPoolAdd( &gRecvThreadPool, &job, NULL ) != 0 ) {
-        DBGONLY( UpnpPrintf
-                 ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                   "mserv %d: cannot schedule request\n", connfd );
-             )
+    if( ThreadPoolAdd( &gMiniServerThreadPool, &job, NULL ) != 0 ) {
+        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+            "mserv %d: cannot schedule request\n", connfd );
            free( request );
        shutdown( connfd, SD_BOTH );
        UpnpCloseSocket( connfd );
@@ -446,11 +434,9 @@ RunMiniServer( MiniServerSockArray * miniSock )

        if( select( maxMiniSock, &rdSet, NULL, &expSet, NULL ) ==
            UPNP_SOCKETERROR ) {
-            DBGONLY( UpnpPrintf
-                     ( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-                       "Error in select call !!!\n" );
-                 )
-                continue;
+            UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+                "Error in select call !!!\n" );
+            continue;
        } else {

            if( FD_ISSET( miniServSock, &rdSet ) ) {
@@ -459,12 +445,10 @@ RunMiniServer( MiniServerSockArray * miniSock )
                                     ( struct sockaddr * )&clientAddr,
                                     &clientLen );
                if( connectHnd == UPNP_INVALID_SOCKET ) {
-                    DBGONLY( UpnpPrintf
-                             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                               "miniserver: Error"
-                               " in accepting connection\n" );
-                         )
-                        continue;
+                    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+                        "miniserver: Error"
+                        " in accepting connection\n" );
+                    continue;
                }
                schedule_request_job( connectHnd, &clientAddr );
            }
@@ -489,24 +473,19 @@ RunMiniServer( MiniServerSockArray * miniSock )
                              &clientLen );
                if( byteReceived > 0 ) {
                    requestBuf[byteReceived] = '\0';
-                    DBGONLY( UpnpPrintf
-                             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                               "Received response !!!  %s From host %s \n",
-                               requestBuf,
-                               inet_ntoa( clientAddr.sin_addr ) );
-                         )
-                        DBGONLY( UpnpPrintf
-                                 ( UPNP_PACKET, MSERV, __FILE__, __LINE__,
-                                   "Received multicast packet: \n %s\n",
-                                   requestBuf );
-                         )
+                    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+                        "Received response !!!  %s From host %s \n",
+                        requestBuf, inet_ntoa( clientAddr.sin_addr ) );
+                    UpnpPrintf( UPNP_PACKET, MSERV, __FILE__, __LINE__,
+                        "Received multicast packet: \n %s\n",
+                        requestBuf );

-                        if( NULL != strstr( requestBuf, "ShutDown" ) )
+                    if( NULL != strstr( requestBuf, "ShutDown" ) ) {
                        break;
+		    }
                }
            }
        }
-
    }

    shutdown( miniServSock, SD_BOTH );
@@ -555,12 +534,10 @@ get_port( int sockfd )
    }

    port = ntohs( sockinfo.sin_port );
-    DBGONLY( UpnpPrintf
-             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-               "sockfd = %d, .... port = %d\n", sockfd, port );
-         )
+    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        "sockfd = %d, .... port = %d\n", sockfd, port );

-        return port;
+    return port;
 }

 /************************************************************************
@@ -623,16 +600,10 @@ get_miniserver_sockets( MiniServerSockArray * out,
        //THIS MAY CAUSE TCP TO BECOME LESS RELIABLE
        //HOWEVER IT HAS BEEN SUGESTED FOR TCP SERVERS

-        DBGONLY( UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                             "mserv start: resuseaddr set\n" );
-             )
-
-            sockError = setsockopt( listenfd,
-                                    SOL_SOCKET,
-                                    SO_REUSEADDR,
-                                    ( const char * )&reuseaddr_on,
-                                    sizeof( int )
-             );
+        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+            "mserv start: resuseaddr set\n" );
+        sockError = setsockopt( listenfd, SOL_SOCKET, SO_REUSEADDR,
+            ( const char * )&reuseaddr_on, sizeof( int ));
        if( sockError == UPNP_SOCKETERROR ) {
            shutdown( listenfd, SD_BOTH );
            UpnpCloseSocket( listenfd );
@@ -652,9 +623,9 @@ get_miniserver_sockets( MiniServerSockArray * out,
                 );
            if( sockError == UPNP_SOCKETERROR ) {
 #ifdef WIN32
-				errCode = WSAGetLastError();
+                errCode = WSAGetLastError();
 #else
-				errCode = errno; 
+                errCode = errno; 
 #endif
                if( errno == EADDRINUSE )
                    errCode = 1;
@@ -665,18 +636,16 @@ get_miniserver_sockets( MiniServerSockArray * out,
    }

    if( sockError == UPNP_SOCKETERROR ) {
-        DBGONLY( perror( "mserv start: bind failed" );
-             )
-            shutdown( listenfd, SD_BOTH );
+        perror( "mserv start: bind failed" );
+        shutdown( listenfd, SD_BOTH );
        UpnpCloseSocket( listenfd );
        return UPNP_E_SOCKET_BIND;  // bind failed
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                         "mserv start: bind success\n" );
-         )
+    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        "mserv start: bind success\n" );

-        success = listen( listenfd, SOMAXCONN );
+    success = listen( listenfd, SOMAXCONN );
    if( success == UPNP_SOCKETERROR ) {
        shutdown( listenfd, SD_BOTH );
        UpnpCloseSocket( listenfd );
@@ -694,11 +663,10 @@ get_miniserver_sockets( MiniServerSockArray * out,

    if( ( miniServerStopSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) ==
        UPNP_INVALID_SOCKET ) {
-        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-                             MSERV, __FILE__, __LINE__,
-                             "Error in socket operation !!!\n" );
-             )
-            shutdown( listenfd, SD_BOTH );
+        UpnpPrintf( UPNP_CRITICAL,
+            MSERV, __FILE__, __LINE__,
+            "Error in socket operation !!!\n" );
+        shutdown( listenfd, SD_BOTH );
        UpnpCloseSocket( listenfd );
        return UPNP_E_OUTOF_SOCKET;
    }
@@ -711,11 +679,10 @@ get_miniserver_sockets( MiniServerSockArray * out,
    if( bind( miniServerStopSock, ( struct sockaddr * )&serverAddr,
              sizeof( serverAddr ) ) == UPNP_SOCKETERROR ) {

-        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-                             MSERV, __FILE__, __LINE__,
-                             "Error in binding localhost!!!\n" );
-             )
-            shutdown( listenfd, SD_BOTH );
+        UpnpPrintf( UPNP_CRITICAL,
+            MSERV, __FILE__, __LINE__,
+            "Error in binding localhost!!!\n" );
+        shutdown( listenfd, SD_BOTH );
        UpnpCloseSocket( listenfd );
        shutdown( miniServerStopSock, SD_BOTH );
        UpnpCloseSocket( miniServerStopSock );
@@ -805,7 +772,7 @@ StartMiniServer( unsigned short listen_port )

    TPJobSetFreeFunction( &job, ( free_routine ) free );

-    success = ThreadPoolAddPersistent( &gRecvThreadPool, &job, NULL );
+    success = ThreadPoolAddPersistent( &gMiniServerThreadPool, &job, NULL );

    if( success < 0 ) {
        shutdown( miniSocket->miniServerSock, SD_BOTH );
@@ -877,11 +844,9 @@ StopMiniServer( void )

    sock = socket( AF_INET, SOCK_DGRAM, 0 );
    if( sock == UPNP_INVALID_SOCKET ) {
-        DBGONLY( UpnpPrintf
-                 ( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                   "SSDP_SERVER:StopSSDPServer: Error in socket operation !!!\n" );
-             )
-            return 0;
+        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            "SSDP_SERVER:StopSSDPServer: Error in socket operation !!!\n" );
+        return 0;
    }

    while( gMServState != MSERV_IDLE ) {
--- a/upnp/src/genlib/net/http/httpparser.c
+++ b/upnp/src/genlib/net/http/httpparser.c
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
--- a/upnp/src/genlib/net/http/statcodes.c
+++ b/upnp/src/genlib/net/http/statcodes.c
@@ -118,7 +118,7 @@ static xboolean gInitialized = FALSE;
 * Returns:																
 *	 void																
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 init_table( IN const char *encoded_str,
            OUT const char *table[],
            IN int tbl_size )
@@ -144,7 +144,7 @@ init_table( IN const char *encoded_str,
 * Returns:																
 *	 void																
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 init_tables( void )
 {
    init_table( Http1xxStr, Http1xxCodes, NUM_1XX_CODES );
--- a/upnp/src/genlib/net/http/webserver.c
+++ b/upnp/src/genlib/net/http/webserver.c
@@ -37,6 +37,12 @@
 #include "config.h"
 #include <assert.h>
 #include <fcntl.h>
+#ifndef UPNP_USE_BCBPP
+#ifndef UPNP_USE_MSVCPP
+    #include <inttypes.h>
+    #include <stdint.h>
+#endif
+#endif
 #include "util.h"
 #include "strintmap.h"
 #include "membuffer.h"
@@ -49,7 +55,7 @@
 #include "ssdplib.h"

 #ifndef WIN32
- #include <unistd.h>
+    #include <unistd.h>
 #endif
 #include <sys/stat.h>
 #include "ithread.h"
@@ -199,7 +205,7 @@ extern str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES];
 * Returns:																
 *	 void																
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 media_list_init( void )
 {
    int i;
@@ -237,7 +243,7 @@ media_list_init( void )
 *	 0 on success;														
 *	-1 on error															
 ************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 search_extension( IN const char *extension,
                  OUT const char **con_type,
                  OUT const char **con_subtype )
@@ -284,7 +290,7 @@ search_extension( IN const char *extension,
 *	 0 - On Sucess														
 *	 UPNP_E_OUTOF_MEMORY - on memory allocation failures				
 ************************************************************************/
-XINLINE int
+UPNP_INLINE int
 get_content_type( IN const char *filename,
                  OUT DOMString * content_type )
 {
@@ -342,7 +348,7 @@ get_content_type( IN const char *filename,
 * Returns:																
 *	 void																
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 glob_alias_init( void )
 {
    struct xml_alias_t *alias = &gAliasDoc;
@@ -364,7 +370,7 @@ glob_alias_init( void )
 * Returns:																
 *	 BOOLEAN															
 ************************************************************************/
-static XINLINE xboolean
+static UPNP_INLINE xboolean
 is_valid_alias( IN const struct xml_alias_t *alias )
 {
    return alias->doc.buf != NULL;
@@ -631,13 +637,13 @@ get_file_info( IN const char *filename,

    rc = get_content_type( filename, &info->content_type );

-    DBGONLY( UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-                         "file info: %s, length: %lld, last_mod=%s readable=%d\n",
-                         filename, (long long)info->file_length,
-                         asctime( gmtime( &info->last_modified ) ),
-                         info->is_readable ); )
+    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+        "file info: %s, length: %lld, last_mod=%s readable=%d\n",
+        filename, (long long)info->file_length,
+        asctime( gmtime( &info->last_modified ) ),
+        info->is_readable );

-        return rc;
+    return rc;
 }

 /************************************************************************
@@ -694,7 +700,7 @@ web_server_set_root_dir( IN const char *root_dir )
 *	TRUE - On Success													
 *	FALSE if request is not an alias									
 ************************************************************************/
-static XINLINE xboolean
+static UPNP_INLINE xboolean
 get_alias( IN const char *request_file,
           OUT struct xml_alias_t *alias,
           OUT struct File_Info *info )
@@ -985,35 +991,35 @@ CreateHTTPRangeResponseHeader( char *ByteRangeSpecifier,
            Instr->RangeOffset = FirstByte;
            Instr->ReadSendSize = LastByte - FirstByte + 1;
            sprintf( Instr->RangeHeader,
-                "CONTENT-RANGE: bytes %lld-%lld/%lld\r\n",
-                (long long)FirstByte,
-                (long long)LastByte,
-                (long long)FileLength );   //Data between two range.
+                "CONTENT-RANGE: bytes %"PRId64"-%"PRId64"/%"PRId64"\r\n",
+                (int64_t)FirstByte,
+                (int64_t)LastByte,
+                (int64_t)FileLength );   //Data between two range.
        } else if( FirstByte >= 0 && LastByte == -1
                   && FirstByte < FileLength ) {
            Instr->RangeOffset = FirstByte;
            Instr->ReadSendSize = FileLength - FirstByte;
            sprintf( Instr->RangeHeader,
-                     "CONTENT-RANGE: bytes %lld-%lld/%lld\r\n",
-                     (long long)FirstByte,
-                     (long long)(FileLength - 1),
-                     (long long)FileLength );
+                     "CONTENT-RANGE: bytes %"PRId64"-%"PRId64"/%"PRId64"\r\n",
+                     (int64_t)FirstByte,
+                     (int64_t)(FileLength - 1),
+                     (int64_t)FileLength );
        } else if( FirstByte == -1 && LastByte > 0 ) {
            if( LastByte >= FileLength ) {
                Instr->RangeOffset = 0;
                Instr->ReadSendSize = FileLength;
                sprintf( Instr->RangeHeader,
-                         "CONTENT-RANGE: bytes 0-%lld/%lld\r\n",
-                         (long long)(FileLength - 1),
-                         (long long)FileLength );
+                         "CONTENT-RANGE: bytes 0-%"PRId64"/%"PRId64"\r\n",
+                         (int64_t)(FileLength - 1),
+                         (int64_t)FileLength );
            } else {
                Instr->RangeOffset = FileLength - LastByte;
                Instr->ReadSendSize = LastByte;
                sprintf( Instr->RangeHeader,
-                         "CONTENT-RANGE: bytes %lld-%lld/%lld\r\n",
-                         (long long)(FileLength - LastByte + 1),
-                         (long long)FileLength,
-                         (long long)FileLength );
+                         "CONTENT-RANGE: bytes %"PRId64"-%"PRId64"/%"PRId64"\r\n",
+                         (int64_t)(FileLength - LastByte + 1),
+                         (int64_t)FileLength,
+                         (int64_t)FileLength );
            }
        } else {
            free( RangeInput );
@@ -1201,7 +1207,7 @@ process_request( IN http_message_t * req,
    int resp_major,
      resp_minor;
    xboolean alias_grabbed;
-    int dummy;
+    size_t dummy;
    struct UpnpVirtualDirCallbacks *pVirtualDirCallback;

    print_http_headers( req );
@@ -1580,14 +1586,11 @@ http_RecvPostMessage( http_parser_t * parser,
                }
            } else if( num_read == 0 ) {
                if( ok_on_close ) {
-                    DBGONLY( UpnpPrintf
-                             ( UPNP_INFO, HTTP, __FILE__, __LINE__,
-                               "<<< (RECVD) <<<\n%s\n-----------------\n",
-                               parser->msg.msg.buf );
-                             //print_http_headers( &parser->msg );
-                         )
-
-                        parser->position = POS_COMPLETE;
+                    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+                        "<<< (RECVD) <<<\n%s\n-----------------\n",
+                        parser->msg.msg.buf );
+                    print_http_headers( &parser->msg );
+                    parser->position = POS_COMPLETE;
                } else {
                    // partial msg
                    parser->http_error_code = HTTP_BAD_REQUEST; // or response
@@ -1754,10 +1757,9 @@ web_server_callback( IN http_parser_t * parser,
        }
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-                         "webserver: request processed...\n" );
-         )
+    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+        "webserver: request processed...\n" );

-        membuffer_destroy( &headers );
+    membuffer_destroy( &headers );
    membuffer_destroy( &filename );
 }
--- a/upnp/src/genlib/net/sock.c
+++ b/upnp/src/genlib/net/sock.c
@@ -231,6 +231,15 @@ sock_read_write( IN SOCKINFO * info,
        }
    }

+#ifdef SO_NOSIGPIPE
+    {
+	int old;
+	int set = 1;
+	socklen_t olen = sizeof(old);
+	getsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, &olen);
+	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set));
+#endif
+
    if( bRead ) {
        // read data
        numBytes = recv( sockfd, buffer, bufsize,MSG_NOSIGNAL);
@@ -243,6 +252,9 @@ sock_read_write( IN SOCKINFO * info,
                send( sockfd, buffer + bytes_sent, byte_left,
                      MSG_DONTROUTE|MSG_NOSIGNAL);
            if( num_written == -1 ) {
+#ifdef SO_NOSIGPIPE
+	        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
+#endif
                return num_written;
            }

@@ -253,6 +265,11 @@ sock_read_write( IN SOCKINFO * info,
        numBytes = bytes_sent;
    }

+#ifdef SO_NOSIGPIPE
+	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
+    }
+#endif
+
    if( numBytes < 0 ) {
        return UPNP_E_SOCKET_ERROR;
    }
--- a/upnp/src/genlib/net/uri/uri.c
+++ b/upnp/src/genlib/net/uri/uri.c
@@ -34,8 +34,11 @@
 ************************************************************************/

 #ifdef __FreeBSD__
+#include <osreldate.h>
+#if __FreeBSD_version < 601103
 #include <lwres/netdb.h>
 #endif
+#endif
 #include "config.h"
 #include "uri.h"

@@ -157,7 +160,7 @@ is_escaped( const char *in )
 int
 replace_escaped( char *in,
                 int index,
-                 int *max )
+                 size_t *max )
 {
    int tempInt = 0;
    char tempChar = 0;
@@ -364,16 +367,20 @@ free_URL_list( URL_list * list )
 *		uri_type *in ;	URI object
 *
 *	Description : Function useful in debugging for printing a parsed uri.
-*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-DBGONLY( void print_uri( uri_type * in ) {
-         print_token( &in->scheme );
-         print_token( &in->hostport.text );
-         print_token( &in->pathquery ); print_token( &in->fragment );} )
+#ifdef DEBUG
+void print_uri( uri_type *in )
+{
+    print_token( &in->scheme );
+    print_token( &in->hostport.text );
+    print_token( &in->pathquery );
+    print_token( &in->fragment );
+}
+#endif

 /************************************************************************
 *	Function :	print_token
@@ -382,20 +389,23 @@ DBGONLY( void print_uri( uri_type * in ) {
 *		token * in ;	token
 *
 *	Description : Function useful in debugging for printing a token.
-*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-DBGONLY( void print_token( token * in ) {
-         int i = 0;
-         printf( "Token Size : %d\n\'", in->size );
-         for( i = 0; i < in->size; i++ ) {
-         putchar( in->buff[i] );}
-         putchar( '\'' ); putchar( '\n' );}
-
- )
+#ifdef DEBUG
+void print_token(token * in)
+{
+    int i = 0;
+    printf( "Token Size : %"PRIzu"\n\'", in->size );
+    for( i = 0; i < in->size; i++ ) {
+        putchar( in->buff[i] );
+    }
+    putchar( '\'' );
+    putchar( '\n' );
+}
+#endif

 /************************************************************************
 *	Function :	token_string_casecmp
@@ -414,8 +424,10 @@ DBGONLY( void print_token( token * in ) {
 *
 *	Note :
 ************************************************************************/
-    int token_string_casecmp( token * in1,
-                              char *in2 ) {
+int token_string_casecmp(
+    token * in1,
+    char *in2 )
+{
    int in2_length = strlen( in2 );

    if( in1->size != in2_length )
@@ -611,14 +623,16 @@ parse_hostport( const char *in,
        int errCode = 0;

        //call gethostbyname_r (reentrant form of gethostbyname)
-#if defined(WIN32)
+        // TODO: Use autoconf to discover this rather than the
+        // platform-specific stuff below
+#if defined(WIN32) || defined(__CYGWIN__)
        h=gethostbyname(temp_host_name);
 #elif defined(SPARC_SOLARIS)
        errCode = gethostbyname_r( temp_host_name,
                                   &h,
                                   temp_hostbyname_buff,
                                   BUFFER_SIZE, &errcode );
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) && __FreeBSD_version < 601103
        h = lwres_gethostbyname_r( temp_host_name,
                                   &h_buf,
                                   temp_hostbyname_buff,
@@ -626,11 +640,38 @@ parse_hostport( const char *in,
        if ( h == NULL ) {
            errCode = 1;
        }
-#else
+#elif defined(__linux__)
        errCode = gethostbyname_r( temp_host_name,
                                   &h_buf,
                                   temp_hostbyname_buff,
                                   BUFFER_SIZE, &h, &errcode );
+#else
+{
+           struct addrinfo hints, *res, *res0;
+
+	   h = NULL;
+           memset(&hints, 0, sizeof(hints));
+           hints.ai_family = PF_INET;
+           hints.ai_socktype = SOCK_STREAM;
+           errCode = getaddrinfo(temp_host_name, "http", &hints, &res0);
+
+           if (!errCode) {
+               for (res = res0; res; res = res->ai_next) {
+                   if (res->ai_family == PF_INET &&
+                       res->ai_addr->sa_family == AF_INET)
+                   {
+                       h = &h_buf;
+                       h->h_addrtype = res->ai_addr->sa_family;
+                       h->h_length = 4;
+                       h->h_addr = (void *) temp_hostbyname_buff;
+                       *(struct in_addr *)h->h_addr =
+				((struct sockaddr_in *)res->ai_addr)->sin_addr;
+                       break;
+                   }
+               }
+               freeaddrinfo(res0);
+           }
+}
 #endif 

        if( errCode == 0 ) {
@@ -731,7 +772,7 @@ parse_scheme( const char *in,
 ************************************************************************/
 int
 remove_escaped_chars( INOUT char *in,
-                      INOUT int *size )
+                      INOUT size_t *size )
 {
    int i = 0;

@@ -785,9 +826,8 @@ remove_dots( char *in,
        return UPNP_E_OUTOF_MEMORY;

    Segments[0] = NULL;
-    DBGONLY( UpnpPrintf
-             ( UPNP_ALL, API, __FILE__, __LINE__,
-               "REMOVE_DOTS: before: %s\n", in ) );
+    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+        "REMOVE_DOTS: before: %s\n", in );
    while( ( copyFrom < max ) && ( *copyFrom != '?' )
           && ( *copyFrom != '#' ) ) {

@@ -832,9 +872,8 @@ remove_dots( char *in,
    }
    ( *copyTo ) = 0;
    free( Segments );
-    DBGONLY( UpnpPrintf
-             ( UPNP_ALL, API, __FILE__, __LINE__,
-               "REMOVE_DOTS: after: %s\n", in ) );
+    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+        "REMOVE_DOTS: after: %s\n", in );
    return UPNP_E_SUCCESS;
 }

@@ -1067,7 +1106,7 @@ parse_uri( const char *in,
 int
 parse_uri_and_unescape( char *in,
                        int max,
-                        uri_type * out )
+                        uri_type *out )
 {
    int ret;

--- a/upnp/src/genlib/service_table/service_table.c
+++ b/upnp/src/genlib/service_table/service_table.c
@@ -433,7 +433,7 @@ FindServiceControlURLPath( service_table * table,
 *
 *	Parameters :
 *		service_info *service ;Service whose information is to be printed
-*		Dbg_Level level ; Debug level specified to the print function
+*		Upnp_LogLevel level ; Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information from the 
@@ -443,38 +443,54 @@ FindServiceControlURLPath( service_table * table,
 *
 *	Note :
 ************************************************************************/
-DBGONLY( void printService( service_info * service, Dbg_Level level,
-                            Dbg_Module module ) {
-         if( service ) {
-         if( service->serviceType )
-         UpnpPrintf( level, module, __FILE__, __LINE__,
-                     "serviceType: %s\n", service->serviceType );
-         if( service->serviceId )
-         UpnpPrintf( level, module, __FILE__, __LINE__, "serviceId: %s\n",
-                     service->serviceId ); if( service->SCPDURL )
-         UpnpPrintf( level, module, __FILE__, __LINE__, "SCPDURL: %s\n",
-                     service->SCPDURL ); if( service->controlURL )
-         UpnpPrintf( level, module, __FILE__, __LINE__, "controlURL: %s\n",
-                     service->controlURL ); if( service->eventURL )
-         UpnpPrintf( level, module, __FILE__, __LINE__, "eventURL: %s\n",
-                     service->eventURL ); if( service->UDN )
-         UpnpPrintf( level, module, __FILE__, __LINE__, "UDN: %s\n\n",
-                     service->UDN ); if( service->active )
-         UpnpPrintf( level, module, __FILE__, __LINE__,
-                     "Service is active\n" );
-         else
-         UpnpPrintf( level, module, __FILE__, __LINE__,
-                     "Service is inactive\n" );}
-         }
-
- )
+#ifdef DEBUG
+void printService(
+    service_info *service,
+    Upnp_LogLevel level,
+    Dbg_Module module )
+{
+    if( service ) {
+        if( service->serviceType ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "serviceType: %s\n", service->serviceType );
+        }
+        if( service->serviceId ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "serviceId: %s\n", service->serviceId );
+        }
+	if( service->SCPDURL ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "SCPDURL: %s\n", service->SCPDURL );
+        }
+	if( service->controlURL ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "controlURL: %s\n", service->controlURL );
+        }
+	if( service->eventURL ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "eventURL: %s\n", service->eventURL );
+        }
+	if( service->UDN ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "UDN: %s\n\n", service->UDN );
+        }
+	if( service->active ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+            "Service is active\n" );
+        } else {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+            "Service is inactive\n" );
+        }
+    }
+}
+#endif

 /************************************************************************
 *	Function :	printServiceList
 *
 *	Parameters :
 *		service_info *service ;	Service whose information is to be printed
-*		Dbg_Level level ;	Debug level specified to the print function
+*		Upnp_LogLevel level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information of each 
@@ -484,43 +500,55 @@ DBGONLY( void printService( service_info * service, Dbg_Level level,
 *
 *	Note :
 ************************************************************************/
-    DBGONLY( void printServiceList( service_info * service,
-                                    Dbg_Level level,
-                                    Dbg_Module module ) {
-             while( service ) {
-             if( service->serviceType )
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "serviceType: %s\n", service->serviceType );
-             if( service->serviceId )
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "serviceId: %s\n", service->serviceId );
-             if( service->SCPDURL )
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "SCPDURL: %s\n", service->SCPDURL );
-             if( service->controlURL )
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "controlURL: %s\n", service->controlURL );
-             if( service->eventURL )
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "eventURL: %s\n", service->eventURL );
-             if( service->UDN )
-             UpnpPrintf( level, module, __FILE__, __LINE__, "UDN: %s\n\n",
-                         service->UDN ); if( service->active )
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "Service is active\n" );
-             else
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "Service is inactive\n" );
-             service = service->next;}
-             }
- )
+#ifdef DEBUG
+void printServiceList(
+    service_info * service,
+    Upnp_LogLevel level,
+    Dbg_Module module )
+{
+    while( service ) {
+        if( service->serviceType ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "serviceType: %s\n", service->serviceType );
+        }
+        if( service->serviceId ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "serviceId: %s\n", service->serviceId );
+        }
+        if( service->SCPDURL ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "SCPDURL: %s\n", service->SCPDURL );
+        }
+        if( service->controlURL ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "controlURL: %s\n", service->controlURL );
+        }
+        if( service->eventURL ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "eventURL: %s\n", service->eventURL );
+        }
+        if( service->UDN ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "UDN: %s\n\n", service->UDN );
+        }
+        if( service->active ) {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "Service is active\n" );
+        } else {
+            UpnpPrintf( level, module, __FILE__, __LINE__,
+                "Service is inactive\n" );
+        }
+        service = service->next;
+    }
+}
+#endif

 /************************************************************************
 *	Function :	printServiceTable
 *
 *	Parameters :
 *		service_table * table ;	Service table to be printed
-*		Dbg_Level level ;	Debug level specified to the print function
+*		Upnp_LogLevel level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints the URL base of the table
@@ -531,15 +559,18 @@ DBGONLY( void printService( service_info * service, Dbg_Level level,
 *
 *	Note :
 ************************************************************************/
-    DBGONLY( void printServiceTable( service_table * table,
-                                     Dbg_Level level,
-                                     Dbg_Module module ) {
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "URL_BASE: %s\n", table->URLBase );
-             UpnpPrintf( level, module, __FILE__, __LINE__,
-                         "Services: \n" );
-             printServiceList( table->serviceList, level, module );}
- )
+#ifdef DEBUG
+void printServiceTable(
+    service_table * table,
+    Upnp_LogLevel level,
+    Dbg_Module module )
+{
+    UpnpPrintf( level, module, __FILE__, __LINE__,
+        "URL_BASE: %s\n", table->URLBase );
+    UpnpPrintf( level, module, __FILE__, __LINE__,
+        "Services: \n" );
+    printServiceList( table->serviceList, level, module );}
+#endif

 /************************************************************************
 *	Function :	freeService
@@ -554,7 +585,7 @@ DBGONLY( void printService( service_info * service, Dbg_Level level,
 *
 *	Note :
 ************************************************************************/
-     void freeService( service_info * in )
+void freeService( service_info * in )
 {
    if( in ) {
        if( in->serviceType )
@@ -849,12 +880,10 @@ getServiceList( IXML_Node * node,
                    ( !
                      ( current->controlURL =
                        resolve_rel_url( URLBase, tempDOMString ) ) ) ) {
-                    DBGONLY( UpnpPrintf
-                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
-                               "BAD OR MISSING CONTROL URL" ) );
-                    DBGONLY( UpnpPrintf
-                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
-                               "CONTROL URL SET TO NULL IN SERVICE INFO" ) );
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "BAD OR MISSING CONTROL URL" );
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "CONTROL URL SET TO NULL IN SERVICE INFO" );
                    current->controlURL = NULL;
                    fail = 0;
                }
@@ -870,12 +899,10 @@ getServiceList( IXML_Node * node,
                    ( !
                      ( current->eventURL =
                        resolve_rel_url( URLBase, tempDOMString ) ) ) ) {
-                    DBGONLY( UpnpPrintf
-                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
-                               "BAD OR MISSING EVENT URL" ) );
-                    DBGONLY( UpnpPrintf
-                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
-                               "EVENT URL SET TO NULL IN SERVICE INFO" ) );
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "BAD OR MISSING EVENT URL" );
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "EVENT URL SET TO NULL IN SERVICE INFO" );
                    current->eventURL = NULL;
                    fail = 0;
                }
@@ -908,20 +935,20 @@ getServiceList( IXML_Node * node,
 }

 /************************************************************************
-*	Function :	getAllServiceList
+* Function : getAllServiceList
 *
-*	Parameters :
-*		IXML_Node *node ;	XML node information
-*		char * URLBase ;	provides Base URL to resolve relative URL 
-*		service_info **out_end ; service added is returned to the output
-*							parameter
+* Parameters :
+*	IXML_Node *node ;	XML node information
+*	char * URLBase ;	provides Base URL to resolve relative URL 
+*	service_info **out_end ; service added is returned to the output
+*				parameter
 *
-*	Description :	Returns pointer to service info after getting the 
+* Description :	Returns pointer to service info after getting the 
 *		sub-elements of the service info. 
 *
-*	Return : service_info * ;
+* Return : service_info * ;
 *
-*	Note :
+* Note :
 ************************************************************************/
 service_info *
 getAllServiceList( IXML_Node * node,
@@ -1092,20 +1119,20 @@ addServiceTable( IXML_Node * node,
 }

 /************************************************************************
-*	Function :	getServiceTable
-*
-*	Parameters :
-*		IXML_Node *node ;	XML node information
-*		service_table *out ;	output parameter which will contain the 
-*							service list and URL 
-*		const char *DefaultURLBase ; Default base URL on which the URL 
-*							will be returned.
-*
-*	Description :	Retrieve service from the table
-*
-*	Return : int ;
-*
-*	Note :
+ * Function : getServiceTable
+ *
+ * Parameters :
+ * 	IXML_Node *node ;	XML node information
+ *	service_table *out ;	output parameter which will contain the
+ *				service list and URL
+ *	const char *DefaultURLBase ; Default base URL on which the URL
+ *				will be returned.
+ *
+ * Description : Retrieve service from the table
+ *
+ * Return : int ;
+ *
+ * Note :
 ************************************************************************/
 int
 getServiceTable( IXML_Node * node,
@@ -1126,9 +1153,8 @@ getServiceTable( IXML_Node * node,
            }
        }

-        if( ( out->serviceList = getAllServiceList( root, out->URLBase,
-                                                    &out->
-                                                    endServiceList ) ) ) {
+        if( ( out->serviceList = getAllServiceList(
+            root, out->URLBase, &out->endServiceList ) ) ) {
            return 1;
        }

--- a/upnp/src/genlib/util/membuffer.c
+++ b/upnp/src/genlib/util/membuffer.c
@@ -171,7 +171,7 @@ memptr_cmp_nocase( IN memptr * m,
 *
 *	Note :
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 membuffer_initialize( INOUT membuffer * m )
 {
    m->buf = NULL;
@@ -331,9 +331,10 @@ membuffer_assign( INOUT membuffer * m,
        return return_code;
    }
    // copy
-    memcpy( m->buf, buf, buf_len );
-    m->buf[buf_len] = 0;        // null-terminate
-
+    if( buf_len ) {
+        memcpy( m->buf, buf, buf_len );
+        m->buf[buf_len] = 0;        // null-terminate
+    }
    m->length = buf_len;

    return 0;
--- a/upnp/src/inc/config.h
+++ b/upnp/src/inc/config.h
@@ -304,27 +304,6 @@



-/** @name DBGONLY
-          The {\bf DBGONLY} macro allows code to be marked so that it 
-          is only included in the DEBUG build and not the release.  To
-          use this macro, put the code inside of the parentheses:
-
-          {\tt DBGONLY(int i;)}
-
-          This will cause a declaration of the integer {\tt i} only
-          in the debug build.
-  */
-
-//@{
-#ifdef DEBUG
-#	define DBGONLY(x) x
-#else
-#	define DBGONLY(x)  
-#endif
-//@}
-
-
-
 #undef  EXCLUDE_WEB_SERVER 
 #undef  EXCLUDE_MINISERVER 
 #ifdef  INTERNAL_WEB_SERVER
@@ -359,13 +338,6 @@
 #	define CLIENTONLY(x)
 #endif

-#ifdef INCLUDE_DEVICE_APIS
-#	define DEVICEONLY(x) x
-#else 
-#	define DEVICEONLY(x) 
-#endif
-
 //@}
 #endif

-
--- a/upnp/src/inc/gena.h
+++ b/upnp/src/inc/gena.h
@@ -89,25 +89,26 @@
 #define DEFAULT_TIMEOUT 1801


-
 extern ithread_mutex_t GlobalClientSubscribeMutex;

-//Lock the subscription
+// Lock the subscription
 #define SubscribeLock() \
-	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__, \
-	"Trying Subscribe Lock"));  \
+	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+		"Trying Subscribe Lock");  \
 	ithread_mutex_lock(&GlobalClientSubscribeMutex); \
-	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__,"Subscribe Lock");)
+	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+		"Subscribe Lock");

-//Unlock the subscription
+// Unlock the subscription
 #define SubscribeUnlock() \
-	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__, \
-		"Trying Subscribe UnLock")); \
+	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+		"Trying Subscribe UnLock"); \
 	ithread_mutex_unlock(&GlobalClientSubscribeMutex); \
-	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__,"Subscribe UnLock");)
+	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+		"Subscribe UnLock");


-//Structure to send NOTIFY message to all subscribed control points
+// Structure to send NOTIFY message to all subscribed control points
 typedef struct NOTIFY_THREAD_STRUCT {
  char * headers;
  DOMString propertySet;
@@ -161,11 +162,13 @@ EXTERN_C void genaCallback (IN http_parser_t *parser,
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-CLIENTONLY(
-	EXTERN_C int genaSubscribe(UpnpClient_Handle client_handle,
-				char * PublisherURL,
-				int * TimeOut, 
-				Upnp_SID  out_sid );)
+#ifdef INCLUDE_CLIENT_APIS
+EXTERN_C int genaSubscribe(
+	UpnpClient_Handle client_handle,
+	char * PublisherURL,
+	int * TimeOut, 
+	Upnp_SID  out_sid );
+#endif


 /************************************************************************
@@ -184,8 +187,11 @@ CLIENTONLY(
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-CLIENTONLY(EXTERN_C int genaUnSubscribe(UpnpClient_Handle client_handle,
-		   const Upnp_SID in_sid);)
+#ifdef INCLUDE_CLIENT_APIS
+EXTERN_C int genaUnSubscribe(
+	UpnpClient_Handle client_handle,
+	const Upnp_SID in_sid);
+#endif

 /************************************************************************
 * Function : genaUnregisterClient									
@@ -202,8 +208,9 @@ CLIENTONLY(EXTERN_C int genaUnSubscribe(UpnpClient_Handle client_handle,
 * Returns: int
 *	return UPNP_E_SUCCESS if successful else returns appropriate error
 ***************************************************************************/
-CLIENTONLY(EXTERN_C int genaUnregisterClient(
-			UpnpClient_Handle client_handle);)
+#ifdef INCLUDE_CLIENT_APIS
+EXTERN_C int genaUnregisterClient(UpnpClient_Handle client_handle);
+#endif

 //server
 /************************************************************************
@@ -218,8 +225,9 @@ CLIENTONLY(EXTERN_C int genaUnregisterClient(
 * Returns: int
 *	returns UPNP_E_SUCCESS if successful else returns GENA_E_BAD_HANDLE
 ****************************************************************************/
-DEVICEONLY(EXTERN_C int genaUnregisterDevice(
-				UpnpDevice_Handle device_handle);)
+#ifdef INCLUDE_DEVICE_APIS
+EXTERN_C int genaUnregisterDevice(UpnpDevice_Handle device_handle);
+#endif


 /************************************************************************
@@ -242,10 +250,12 @@ DEVICEONLY(EXTERN_C int genaUnregisterDevice(
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-CLIENTONLY(EXTERN_C int genaRenewSubscription(
-							IN UpnpClient_Handle client_handle,
-							IN const Upnp_SID in_sid,
-							OUT int * TimeOut);)
+#ifdef INCLUDE_CLIENT_APIS
+EXTERN_C int genaRenewSubscription(
+	IN UpnpClient_Handle client_handle,
+	IN const Upnp_SID in_sid,
+	OUT int * TimeOut);
+#endif
 /****************************************************************************
 *	Function :	genaNotifyAll
 *
@@ -265,33 +275,40 @@ CLIENTONLY(EXTERN_C int genaRenewSubscription(
 *	Note : This function is similar to the genaNotifyAllExt. The only difference
 *			is it takes event variable array instead of xml document.
 ****************************************************************************/
-DEVICEONLY(EXTERN_C int genaNotifyAll(UpnpDevice_Handle device_handle,
-			   char *UDN,
-			   char *servId,
-			   char **VarNames,
-			   char **VarValues,
-		    int var_count
-				      );)
+#ifdef INCLUDE_DEVICE_APIS
+EXTERN_C int genaNotifyAll(
+	UpnpDevice_Handle device_handle,
+	char *UDN,
+	char *servId,
+	char **VarNames,
+	char **VarValues,
+	int var_count);
+#endif

 /****************************************************************************
-*	Function :	genaNotifyAllExt
+* Function :	genaNotifyAllExt
 *
-*	Parameters :
-*			IN UpnpDevice_Handle device_handle : Device handle
-*			IN char *UDN :	Device udn
-*			IN char *servId :	Service ID
-*           IN IXML_Document *PropSet :	XML document Event varible property set
+* Parameters :
+*	IN UpnpDevice_Handle device_handle : Device handle
+*	IN char *UDN :			Device udn
+*	IN char *servId :		Service ID
+*	IN IXML_Document *PropSet :	XML document Event varible property set
 *
-*	Description : 	This function sends a notification to all the subscribed
+* Description : This function sends a notification to all the subscribed
 *	control points
 *
-*	Return :	int
+* Return : int
 *
-*	Note : This function is similar to the genaNotifyAll. the only difference
-*			is it takes the document instead of event variable array
+* Note : This function is similar to the genaNotifyAll. the only difference
+*	is it takes the document instead of event variable array
 ****************************************************************************/
-DEVICEONLY(EXTERN_C int genaNotifyAllExt(UpnpDevice_Handle device_handle, 
-		   char *UDN, char *servId,IN IXML_Document *PropSet);)
+#ifdef INCLUDE_DEVICE_APIS
+EXTERN_C int genaNotifyAllExt(
+	UpnpDevice_Handle device_handle, 
+	char *UDN,
+	char *servId,
+	IN IXML_Document *PropSet);
+#endif

 /****************************************************************************
 *	Function :	genaInitNotify
@@ -314,13 +331,15 @@ DEVICEONLY(EXTERN_C int genaNotifyAllExt(UpnpDevice_Handle device_handle,
 *	Note : No other event will be sent to this control point before the 
 *			intial state table dump.
 ****************************************************************************/
-DEVICEONLY(EXTERN_C int genaInitNotify(IN UpnpDevice_Handle device_handle,
-			    IN char *UDN,
-			    IN char *servId,
-			    IN char **VarNames,
-			    IN char **VarValues,
-				IN int var_count,
-				IN Upnp_SID sid);)
+#ifdef INCLUDE_DEVICE_APIS
+EXTERN_C int genaInitNotify(IN UpnpDevice_Handle device_handle,
+	IN char *UDN,
+	IN char *servId,
+	IN char **VarNames,
+	IN char **VarValues,
+	IN int var_count,
+	IN Upnp_SID sid);
+#endif

 /****************************************************************************
 *	Function :	genaInitNotifyExt
@@ -342,12 +361,14 @@ DEVICEONLY(EXTERN_C int genaInitNotify(IN UpnpDevice_Handle device_handle,
 *	Note : No other event will be sent to this control point before the 
 *			intial state table dump.
 ****************************************************************************/
-DEVICEONLY(EXTERN_C  int genaInitNotifyExt(
-		   IN UpnpDevice_Handle device_handle, 
-		   IN char *UDN, 
-		   IN char *servId,
-		   IN IXML_Document *PropSet, 
-		   IN Upnp_SID sid);)
+#ifdef INCLUDE_DEVICE_APIS
+EXTERN_C  int genaInitNotifyExt(
+	IN UpnpDevice_Handle device_handle, 
+	IN char *UDN, 
+	IN char *servId,
+	IN IXML_Document *PropSet, 
+	IN Upnp_SID sid);
+#endif


 /************************************************************************
--- a/upnp/src/inc/http_client.h
+++ b/upnp/src/inc/http_client.h
@@ -96,7 +96,7 @@ typedef struct SOCKET_BUFFER{
 //holds a pointer into a larger array
 typedef struct TOKEN {
   char * buff;
-  int size;
+  size_t size;
 } token;


@@ -214,37 +214,101 @@ EXTERN_C ssize_t readLine(int fd, char *out, int max, int *timeout);
 EXTERN_C int remove_dots(char * in, int size);


-DBGONLY(EXTERN_C void print_http_request(http_message
-					 *message,Dbg_Level DLevel,
-					 Dbg_Module Module,char *DbgFileName,
-					 int DbgLineNo););
+#ifdef DEBUG
+EXTERN_C void print_http_request(
+	http_message *message,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo);
+#else
+static inline void print_http_request(
+	http_message *message,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo) {}
+#endif

-DBGONLY(EXTERN_C void print_http_response(http_message *message,
-					  Dbg_Level DLevel,
-					  Dbg_Module Module,char *DbgFileName,
-					  int DbgLineNo););
+#ifdef DEBUG
+EXTERN_C void print_http_response(
+	http_message *message,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo);
+#else
+static inline void print_http_response(
+	http_message *message,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo) {}
+#endif

-DBGONLY(EXTERN_C void print_token(  token * in,
-				    Dbg_Level DLevel,
-				    Dbg_Module Module,
-				    char *DbgFileName,
-				    int DbgLineNo););
+#ifdef DEBUG
+EXTERN_C void print_token(
+	token *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo);
+#else
+static inline void print_token(
+	token *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo) {}
+#endif

-DBGONLY(EXTERN_C void print_status_line(http_status *in,
-					Dbg_Level DLevel,
-					Dbg_Module Module,
-					char *DbgFileName,
-					int DbgLineNo););
+#ifdef DEBUG
+EXTERN_C void print_status_line(
+	http_status *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo);
+#else
+static inline void print_status_line(
+	http_status *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo) {}
+#endif

-DBGONLY(EXTERN_C void print_request_line(http_request *in,
-					 Dbg_Level DLevel,
-					 Dbg_Module Module,
-					 char *DbgFileName,int DbgLineNo));
+#ifdef DEBUG
+EXTERN_C void print_request_line(
+	http_request *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo);
+#else
+static inline void print_request_line(
+	http_request *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo) {}
+#endif

-DBGONLY(EXTERN_C void print_uri( uri_type *in,
-				 Dbg_Level DLevel,
-				 Dbg_Module Module,
-				 char *DbgFileName,
-				 int DbgLineNo););
+#ifdef DEBUG
+EXTERN_C void print_uri(
+	uri_type *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo);
+#else
+static inline void print_uri(
+	uri_type *in,
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	char *DbgFileName,
+	int DbgLineNo) {}
+#endif

 #endif
+
--- a/upnp/src/inc/httpparser.h
+++ b/upnp/src/inc/httpparser.h
@@ -448,15 +448,17 @@ int matchstr( IN char *str, IN size_t slen, IN const char* fmt, ... );
 int raw_to_int( IN memptr* raw_value, int base );

 /************************************************************************
-* Function: raw_find_str												
-*																		
-* Parameters:															
-*	IN memptr* raw_value ; Buffer containg the string												
-*	IN const char* str ;	Substring to be found													
-*																		
-* Description: Find a substring from raw character string buffer					
-*																		
-* Returns:																
+* Function: raw_find_str
+*
+* Parameters:
+*	IN memptr* raw_value ; Buffer containg the string
+*	IN const char* str ;	Substring to be found
+*
+* Description: Find a substring from raw character string buffer
+*
+* Side effects: raw_value is transformed to lowercase.
+*
+* Returns:
 *	 int - index at which the substring is found.						
 ************************************************************************/
 int raw_find_str( IN memptr* raw_value, IN const char* str );
@@ -476,17 +478,21 @@ int raw_find_str( IN memptr* raw_value, IN const char* str );
 const char* method_to_str( IN http_method_t method );

 /************************************************************************
-* Function: print_http_headers											
-*																		
-* Parameters:															
-*	http_message_t* hmsg ; HTTP Message object									
-*																		
-* Description:															
-*																		
-* Returns:																
-*	 void																
+* Function: print_http_headers
+*
+* Parameters:
+*	http_message_t* hmsg ; HTTP Message object
+*
+* Description:
+*
+* Returns:
+*	 void
 ************************************************************************/
-void print_http_headers( IN http_message_t* hmsg );
+#ifdef DEBUG
+void print_http_headers( IN http_message_t *hmsg );
+#else
+static UPNP_INLINE void print_http_headers( IN http_message_t *hmsg ) {}
+#endif

 #ifdef __cplusplus
 }		// extern "C"
@@ -494,3 +500,4 @@ void print_http_headers( IN http_message_t* hmsg );


 #endif // GENLIB_NET_HTTP_HTTPPARSER_H
+
--- a/upnp/src/inc/membuffer.h
+++ b/upnp/src/inc/membuffer.h
@@ -51,8 +51,7 @@ typedef struct // memptr
 // note: Total length/capacity should not exceed MAX_INT
 typedef struct // membuffer
 {
-	char	*buf;			// mem buffer; must not write 
-							//   beyond buf[length-1] (read/write)
+	char	*buf;			// mem buffer; must not write beyond buf[length-1] (read/write)
 	size_t	length;			// length of buffer (read-only)
 	size_t	capacity;		// total allocated memory (read-only)
 	size_t	size_inc;		// used to increase size; MUST be > 0; (read/write)
@@ -148,8 +147,7 @@ int memptr_cmp_nocase( IN memptr* m, IN const char* s );
 *
 *	Note :
 ************************************************************************/
-int membuffer_set_size( INOUT membuffer* m, 
-			IN size_t new_length );
+int membuffer_set_size( INOUT membuffer* m, IN size_t new_length );

 /************************************************************************
 *	Function :	membuffer_init
@@ -200,8 +198,7 @@ void membuffer_destroy( INOUT membuffer* m );
 *
 *	Note :
 ************************************************************************/
-int membuffer_assign( INOUT membuffer* m, IN const void* buf, 
-					 IN size_t buf_len );
+int membuffer_assign( INOUT membuffer* m, IN const void* buf, IN size_t buf_len );

 /************************************************************************
 *	Function :	membuffer_assign_str
@@ -237,8 +234,7 @@ int membuffer_assign_str( INOUT membuffer* m, IN const char* c_str );
 *
 *	Note :
 ************************************************************************/
-int membuffer_append( INOUT membuffer* m, IN const void* buf,
-					 IN size_t buf_len );
+int membuffer_append( INOUT membuffer* m, IN const void* buf, IN size_t buf_len );

 /************************************************************************
 *	Function :	membuffer_append_str
@@ -276,8 +272,7 @@ int membuffer_append_str( INOUT membuffer* m, IN const char* c_str );
 *
 *	Note :
 ************************************************************************/
-int membuffer_insert( INOUT membuffer* m, IN const void* buf, 
-					 IN size_t buf_len, int index );
+int membuffer_insert( INOUT membuffer* m, IN const void* buf, IN size_t buf_len, int index );


 /************************************************************************
@@ -298,8 +293,7 @@ int membuffer_insert( INOUT membuffer* m, IN const void* buf,
 *
 *	Note :
 ************************************************************************/
-void membuffer_delete( INOUT membuffer* m, IN int index, 
-					 IN size_t num_bytes );
+void membuffer_delete( INOUT membuffer* m, IN int index, IN size_t num_bytes );


 /************************************************************************
@@ -336,8 +330,7 @@ char* membuffer_detach( INOUT membuffer* m );
 *	Note : 'new_buf' must be allocted using malloc or realloc so
 *		that it can be freed using free()
 ************************************************************************/
-void membuffer_attach( INOUT membuffer* m, IN char* new_buf,
-					   IN size_t buf_len );
+void membuffer_attach( INOUT membuffer* m, IN char* new_buf, IN size_t buf_len );
 #ifdef __cplusplus
 }		// extern "C"
 #endif	// __cplusplus
--- a/upnp/src/inc/miniserver.h
+++ b/upnp/src/inc/miniserver.h
@@ -88,7 +88,11 @@ void SetHTTPGetCallback( MiniServerCallback callback );
 *
 *	Note :
 ************************************************************************/
+#ifdef INCLUDE_DEVICE_APIS
 void SetSoapCallback( MiniServerCallback callback );
+#else 
+static inline void SetSoapCallback( MiniServerCallback callback ) {}
+#endif

 /************************************************************************
 *	Function :	SetGenaCallback
--- a/upnp/src/inc/service_table.h
+++ b/upnp/src/inc/service_table.h
@@ -47,7 +47,7 @@ extern "C" {

 #define SID_SIZE  41

-DEVICEONLY(
+#ifdef INCLUDE_DEVICE_APIS

 typedef struct SUBSCRIPTION {
  Upnp_SID sid;
@@ -61,18 +61,19 @@ typedef struct SUBSCRIPTION {


 typedef struct SERVICE_INFO {
-  DOMString serviceType;
-  DOMString serviceId;
+  DOMString	serviceType;
+  DOMString	serviceId;
  char		*SCPDURL ;
  char		*controlURL;
  char		*eventURL;
-  DOMString UDN;
+  DOMString	UDN;
  int		active;
  int		TotalSubscriptions;
-  subscription			*subscriptionList;
+  subscription	*subscriptionList;
  struct SERVICE_INFO	 *next;
 } service_info;

+
 typedef struct SERVICE_TABLE {
  DOMString URLBase;
  service_info *serviceList;
@@ -80,7 +81,7 @@ typedef struct SERVICE_TABLE {
 } service_table;


-/*			Functions for Subscriptions				*/
+/* Functions for Subscriptions */

 /************************************************************************
 *	Function :	copy_subscription
@@ -253,7 +254,7 @@ service_info * FindServiceControlURLPath( service_table *table,
 *
 *	Parameters :
 *		service_info *service ;Service whose information is to be printed
-*		Dbg_Level level ; Debug level specified to the print function
+*		Upnp_LogLevel level ; Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information from the 
@@ -263,16 +264,24 @@ service_info * FindServiceControlURLPath( service_table *table,
 *
 *	Note :
 ************************************************************************/
-DBGONLY(void printService(service_info *service,Dbg_Level
-				   level,
-				   Dbg_Module module));
+#ifdef DEBUG
+void printService(
+	service_info *service,
+	Upnp_LogLevel level,
+	Dbg_Module module);
+#else
+static UPNP_INLINE void printService(
+	service_info *service,
+	Upnp_LogLevel level,
+	Dbg_Module module) {}
+#endif

 /************************************************************************
 *	Function :	printServiceList
 *
 *	Parameters :
 *		service_info *service ;	Service whose information is to be printed
-*		Dbg_Level level ;	Debug level specified to the print function
+*		Upnp_LogLevel level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information of each 
@@ -282,15 +291,24 @@ DBGONLY(void printService(service_info *service,Dbg_Level
 *
 *	Note :
 ************************************************************************/
-DBGONLY(void printServiceList(service_info *service,
-				       Dbg_Level level, Dbg_Module module));
+#ifdef DEBUG
+void printServiceList(
+	service_info *service,
+	Upnp_LogLevel level,
+	Dbg_Module module);
+#else
+static UPNP_INLINE void printServiceList(
+	service_info *service,
+	Upnp_LogLevel level,
+	Dbg_Module module) {}
+#endif

 /************************************************************************
 *	Function :	printServiceTable
 *
 *	Parameters :
 *		service_table * table ;	Service table to be printed
-*		Dbg_Level level ;	Debug level specified to the print function
+*		Upnp_LogLevel level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints the URL base of the table
@@ -301,9 +319,17 @@ DBGONLY(void printServiceList(service_info *service,
 *
 *	Note :
 ************************************************************************/
-DBGONLY(void printServiceTable(service_table *
-					table,Dbg_Level
-					level,Dbg_Module module));
+#ifdef DEBUG
+void printServiceTable(
+	service_table *table,
+	Upnp_LogLevel level,
+	Dbg_Module module);
+#else
+static UPNP_INLINE void printServiceTable(
+	service_table *table,
+	Upnp_LogLevel level,
+	Dbg_Module module) {}
+#endif

 /************************************************************************
 *	Function :	freeService
@@ -451,10 +477,11 @@ int getSubElement(const char *element_name, IXML_Node *node,
 		  IXML_Node **out);


-)	/* DEVICEONLY */
+#endif /* INCLUDE_DEVICE_APIS */

 #ifdef __cplusplus
 }
 #endif

 #endif /* _SERVICE_TABLE */
+
--- a/upnp/src/inc/soaplib.h
+++ b/upnp/src/inc/soaplib.h
@@ -33,28 +33,28 @@
 #define SOAPLIB_H 


-//SOAP module API to be called in Upnp-Dk API
+// SOAP module API to be called in Upnp-Dk API
 /****************************************************************************
-*	Function :	soap_device_callback
+* Function :	soap_device_callback
 *
-*	Parameters :
-*		  IN http_parser_t *parser : Parsed request received by the device
-*		  IN http_message_t* request :	HTTP request 
-*		  INOUT SOCKINFO *info :	socket info
+* Parameters :
+*	IN http_parser_t *parser :	Parsed request received by the device
+*	IN http_message_t* request :	HTTP request 
+*	INOUT SOCKINFO *info :		socket info
 *
-*	Description :	This is a callback called by minisever after receiving 
-*		the request from the control point. This function will start 
-*		processing the request. It calls handle_invoke_action to handle the
-*		SOAP action
+* Description :	This is a callback called by minisever after receiving 
+*	the request from the control point. This function will start 
+*	processing the request. It calls handle_invoke_action to handle the
+*	SOAP action
 *
-*	Return :	void
+* Return : void
 *
-*	Note :
+* Note :
 ****************************************************************************/
-void soap_device_callback( 
-						  IN http_parser_t *parser, 
-						  IN http_message_t* request, 
-						  INOUT SOCKINFO *info );
+void soap_device_callback(
+	IN http_parser_t *parser, 
+	IN http_message_t* request, 
+	INOUT SOCKINFO *info );


 /****************************************************************************
--- a/upnp/src/inc/ssdplib.h
+++ b/upnp/src/inc/ssdplib.h
@@ -184,12 +184,12 @@ typedef int (*ParserFun)(char *, Event *);
 //int AnalyzeCommand(char * szCommand, Event * Evt);

 /************************************************************************
-* Function : Make_Socket_NoBlocking									
-*																	
-* Parameters:														
-*	IN int sock: socket 
+* Function : Make_Socket_NoBlocking
 *
-* Description:														
+* Parameters:
+*	IN int sock: socket
+*
+* Description:
 *	This function to make ssdp socket non-blocking.
 *
 * Returns: int
@@ -198,12 +198,12 @@ typedef int (*ParserFun)(char *, Event *);
 int Make_Socket_NoBlocking (int sock);

 /************************************************************************
-* Function : ssdp_handle_device_request									
-*																	
-* Parameters:														
+* Function : ssdp_handle_device_request
+*
+* Parameters:
 *		IN void *data:
 *
-* Description:														
+* Description:
 *	This function handles the search request. It do the sanity checks of
 *	the request and then schedules a thread to send a random time reply (
 *	random within maximum time given by the control point to reply).
@@ -211,22 +211,29 @@ int Make_Socket_NoBlocking (int sock);
 * Returns: void *
 *	1 if successful else appropriate error
 ***************************************************************************/
-void ssdp_handle_device_request( IN http_message_t* hmsg, 
-							 IN struct sockaddr_in* dest_addr );
+#ifdef INCLUDE_DEVICE_APIS
+void ssdp_handle_device_request(
+	IN http_message_t* hmsg, 
+	IN struct sockaddr_in* dest_addr );
+#else
+static inline void ssdp_handle_device_request(
+	IN http_message_t* hmsg, 
+	IN struct sockaddr_in* dest_addr ) {}
+#endif

 /************************************************************************
-* Function : ssdp_handle_ctrlpt_msg											
-*																	
-* Parameters:														
+* Function : ssdp_handle_ctrlpt_msg
+*
+* Parameters:
 *	IN http_message_t* hmsg: SSDP message from the device
 *	IN struct sockaddr_in* dest_addr: Address of the device
 *	IN xboolean timeout: timeout kept by the control point while sending 
-*						search message
+*		search message
 *	IN void* cookie: Cookie stored by the control point application. 
-*					This cookie will be returned to the control point
-*					in the callback 
-*																	
-* Description:														
+*		This cookie will be returned to the control point
+*		in the callback
+*
+* Description:
 *	This function handles the ssdp messages from the devices. These 
 *	messages includes the search replies, advertisement of device coming 
 *	alive and bye byes.
@@ -234,20 +241,21 @@ void ssdp_handle_device_request( IN http_message_t* hmsg,
 * Returns: void
 *
 ***************************************************************************/
-void ssdp_handle_ctrlpt_msg( IN http_message_t* hmsg, 
-							 IN struct sockaddr_in* dest_addr,
-							 IN xboolean timeout,
-							 IN void* cookie );
+void ssdp_handle_ctrlpt_msg(
+	IN http_message_t* hmsg, 
+	IN struct sockaddr_in* dest_addr,
+	IN xboolean timeout,
+	IN void* cookie );

 /************************************************************************
-* Function : unique_service_name								
-*																	
-* Parameters:														
-*	IN char *cmd: Service Name string 
-*	OUT SsdpEvent *Evt: The SSDP event structure partially filled 
-*						by all the function.
+* Function : unique_service_name
 *
-* Description:														
+* Parameters:
+*	IN char *cmd: Service Name string
+*	OUT SsdpEvent *Evt: The SSDP event structure partially filled
+*		by all the function.
+*
+* Description:
 *	This function fills the fields of the event structure like DeviceType,
 *	Device UDN and Service Type
 *
@@ -258,12 +266,12 @@ int unique_service_name(char * cmd, SsdpEvent * Evt);


 /************************************************************************
-* Function : get_ssdp_sockets								
-*																	
-* Parameters:														
+* Function : get_ssdp_sockets
+*
+* Parameters:
 *	OUT MiniServerSockArray *out: Arrays of SSDP sockets
 *
-* Description:														
+* Description:
 *	This function creates the ssdp sockets. It set their option to listen 
 *	for multicast traffic.
 *
@@ -274,12 +282,12 @@ int get_ssdp_sockets(MiniServerSockArray *out);


 /************************************************************************
-* Function : readFromSSDPSocket								
-*																	
-* Parameters:														
+* Function : readFromSSDPSocket	
+*
+* Parameters:
 *	IN SOCKET socket: SSDP socket
 *
-* Description:														
+* Description:
 *	This function reads the data from the ssdp socket.
 *
 * Returns: void
@@ -289,13 +297,13 @@ void readFromSSDPSocket(SOCKET socket);


 /************************************************************************
-* Function : ssdp_request_type1								
-*																	
-* Parameters:														
+* Function : ssdp_request_type1
+*
+* Parameters:
 *	IN char *cmd: command came in the ssdp request
 *
-* Description:														
-*	This function figures out the type of the SSDP search in the 
+* Description:
+*	This function figures out the type of the SSDP search in the
 *	in the request.
 *
 * Returns: enum SsdpSearchType
@@ -305,14 +313,14 @@ enum SsdpSearchType ssdp_request_type1(IN char *cmd);


 /************************************************************************
-* Function : ssdp_request_type								
-*																	
-* Parameters:														
+* Function : ssdp_request_type
+*
+* Parameters:
 *	IN char *cmd: command came in the ssdp request
 *	OUT SsdpEvent *Evt: The event structure partially filled by
 *		 this function.
 *
-* Description:														
+* Description:
 *	This function starts filling the SSDP event structure based upon the 
 *	request received. 
 *
@@ -323,17 +331,15 @@ int ssdp_request_type(IN char * cmd, OUT SsdpEvent * Evt);


 /************************************************************************
-* Function : SearchByTarget											
-*																	
-* Parameters:														
-*		IN int Mx:Number of seconds to wait, to collect all the 
-*					responses.
-*		char *St: Search target.
-*		void *Cookie: cookie provided by control point application. This
-*						cokie will be returned to application in the 
-*						callback.
+* Function : SearchByTarget
 *
-* Description:														
+* Parameters:
+*	IN int Mx:Number of seconds to wait, to collect all the	responses.
+*	char *St: Search target.
+*	void *Cookie: cookie provided by control point application. This
+*		cokie will be returned to application in the callback.
+*
+* Description:
 *	This function creates and send the search request for a specific URL.
 *
 * Returns: int
@@ -342,214 +348,224 @@ int ssdp_request_type(IN char * cmd, OUT SsdpEvent * Evt);
 int SearchByTarget(IN int Mx, IN char *St, IN void *Cookie);

 /************************************************************************
-* Function : DeviceAdvertisement									
-*																	
-* Parameters:														
-*	IN char * DevType : type of the device
-*	IN int RootDev: flag to indicate if the device is root device
-*	IN char * nt : value of NT
-*	IN char * usn :
-*	IN char * location :Location URL.
-*	IN int  duration :Service duration in sec.
+* Function : DeviceAdvertisement
 *
-* Description:														
-*	This function creates the device advertisement request based on 
+* Parameters:
+*	IN char *DevType : type of the device
+*	IN int RootDev   : flag to indicate if the device is root device
+*	IN char *Udn     :
+*	IN char *Location: Location URL.
+*	IN int Duration  : Service duration in sec.
+*
+* Description:
+*	This function creates the device advertisement request based on
 *	the input parameter, and send it to the multicast channel.
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int DeviceAdvertisement(IN char * DevType, int RootDev,char * Udn, 
-						IN char * Location, IN int  Duration);
+int DeviceAdvertisement(
+	IN char *DevType,
+	IN int RootDev,
+	IN char *Udn, 
+	IN char *Location,
+	IN int Duration);


 /************************************************************************
-* Function : DeviceShutdown									
-*																	
+* Function : DeviceShutdown
+*
 * Parameters:	
 *	IN char *DevType: Device Type.
 *	IN int RootDev:1 means root device.
-*	IN char * Udn: Device UDN
+*	IN char *Udn: Device UDN
 *	IN char *_Server:
-*	IN char * Location: Location URL
-*	IN int  Duration :Device duration in sec.
+*	IN char *Location: Location URL
+*	IN int Duration :Device duration in sec.
 *
-* Description:														
+* Description:
 *	This function creates a HTTP device shutdown request packet 
 *	and sent it to the multicast channel through RequestHandler.
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int DeviceShutdown( IN char * DevType, 
-				    IN int RootDev,
-					IN char * Udn, 
-					IN char * _Server, 
-					IN char * Location, 
-					IN int  Duration );
+int DeviceShutdown(
+	IN char *DevType, 
+	IN int RootDev,
+	IN char *Udn, 
+	IN char *_Server, 
+	IN char *Location, 
+	IN int Duration);

 /************************************************************************
-* Function : DeviceReply									
-*																	
+* Function : DeviceReply
+*
 * Parameters:	
 *	IN struct sockaddr_in * DestAddr:destination IP address.
 *	IN char *DevType: Device type
 *	IN int RootDev: 1 means root device 0 means embedded device.
-*	IN char * Udn: Device UDN
-*	IN char * Location: Location of Device description document.
-*	IN int  Duration :Life time of this device.
-
-* Description:														
+*	IN char *Udn: Device UDN
+*	IN char *Location: Location of Device description document.
+*	IN int Duration :Life time of this device.
+*
+* Description:
 *	This function creates the reply packet based on the input parameter, 
 *	and send it to the client address given in its input parameter DestAddr.
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int DeviceReply(IN struct sockaddr_in * DestAddr, 
-				IN char *DevType, 
-				IN int RootDev, 
-				IN char * Udn, 
-				IN char * Location, IN int  Duration);
+int DeviceReply(
+	IN struct sockaddr_in * DestAddr, 
+	IN char *DevType, 
+	IN int RootDev, 
+	IN char *Udn, 
+	IN char *Location, IN int  Duration);

 /************************************************************************
-* Function : SendReply									
-*																	
+* Function : SendReply
+*
 * Parameters:	
 *	IN struct sockaddr_in * DestAddr:destination IP address.
 *	IN char *DevType: Device type
 *	IN int RootDev: 1 means root device 0 means embedded device.
 *	IN char * Udn: Device UDN
 *	IN char *_Server:
-*	IN char * Location: Location of Device description document.
-*	IN int  Duration :Life time of this device.
+*	IN char *Location: Location of Device description document.
+*	IN int Duration :Life time of this device.
 *	IN int ByType:
 *
-* Description:														
+* Description:
 *	This function creates the reply packet based on the input parameter, 
 *	and send it to the client addesss given in its input parameter DestAddr.
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int SendReply(IN struct sockaddr_in * DestAddr, 
-			  IN char *DevType, 
-			  IN int RootDev, 
-			  IN char * Udn, 
-			  IN char * Location, 
-			  IN int  Duration, 
-			  IN int ByType );
+int SendReply(
+	IN struct sockaddr_in * DestAddr, 
+	IN char *DevType, 
+	IN int RootDev, 
+	IN char *Udn, 
+	IN char *Location, 
+	IN int Duration, 
+	IN int ByType );

 /************************************************************************
-* Function : ServiceAdvertisement									
-*																	
+* Function : ServiceAdvertisement
+*
 * Parameters:	
 *	IN char * Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
-*	IN int  Duration :Life time of this device.
-
-* Description:														
+*	IN int Duration :Life time of this device.
+*
+* Description:
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
-
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int ServiceAdvertisement( IN char * Udn, 
-						 IN char * ServType,
-						 IN char * Location,
-						 IN int  Duration);
+int ServiceAdvertisement(
+	IN char *Udn, 
+	IN char *ServType,
+	IN char *Location,
+	IN int Duration);

 /************************************************************************
-* Function : ServiceReply									
-*																	
+* Function : ServiceReply
+*
 * Parameters:	
 *	IN struct sockaddr_in *DestAddr:
-*	IN char * Udn: Device UDN
+*	IN char *Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char *Server: Not used
-*	IN char * Location: Location of Device description document.
-*	IN int  Duration :Life time of this device.
-
-* Description:														
+*	IN char *Location: Location of Device description document.
+*	IN int Duration :Life time of this device.
+*
+* Description:
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
-
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int ServiceReply(IN struct sockaddr_in *DestAddr,  
-				 IN char * ServType, 
-				 IN char * Udn, 
-				 IN char * Location,
-				 IN int  Duration);
+int ServiceReply(
+	IN struct sockaddr_in *DestAddr,  
+	IN char *ServType, 
+	IN char *Udn, 
+	IN char *Location,
+	IN int Duration);

 /************************************************************************
-* Function : ServiceShutdown									
-*																	
-* Parameters:	
-*	IN char * Udn: Device UDN
+* Function : ServiceShutdown
+*
+* Parameters:
+*	IN char *Udn: Device UDN
 *	IN char *ServType: Service Type.
-*	IN char * Location: Location of Device description document.
-*	IN int  Duration :Service duration in sec.
-
-* Description:														
+*	IN char *Location: Location of Device description document.
+*	IN int Duration :Service duration in sec.
+*
+* Description:
 *	This function creates a HTTP service shutdown request packet 
 *	and sent it to the multicast channel through RequestHandler.
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int ServiceShutdown( IN char * Udn, IN char * ServType,
-					IN char * Location,
-					IN int  Duration);
+int ServiceShutdown(
+	IN char *Udn,
+	IN char *ServType,
+	IN char *Location,
+	IN int Duration);


 /************************************************************************
-* Function : advertiseAndReplyThread									
-*																	
-* Parameters:														
-*		IN void *data: Structure containing the search request
+* Function : advertiseAndReplyThread
 *
-* Description:														
+* Parameters:
+*	IN void *data: Structure containing the search request
+*
+* Description:
 *	This function is a wrapper function to reply the search request 
 *	coming from the control point.
 *
 * Returns: void *
 *	always return NULL
 ***************************************************************************/
-void * advertiseAndReplyThread(IN void * data);
+void *advertiseAndReplyThread(IN void * data);

 /************************************************************************
-* Function : AdvertiseAndReply									
-*																	
-* Parameters:														
-*	IN int AdFlag: -1 = Send shutdown, 0 = send reply, 
-*					1 = Send Advertisement
+* Function : AdvertiseAndReply
+*
+* Parameters:
+*	IN int AdFlag: -1 = Send shutdown,
+*			0 = send reply, 
+*			1 = Send Advertisement
 *	IN UpnpDevice_Handle Hnd: Device handle
 *	IN enum SsdpSearchType SearchType:Search type for sending replies
 *	IN struct sockaddr_in *DestAddr:Destination address
-*   IN char *DeviceType:Device type
+*	IN char *DeviceType:Device type
 *	IN char *DeviceUDN:Device UDN
-*   IN char *ServiceType:Service type
+*	IN char *ServiceType:Service type
 *	IN int Exp:Advertisement age
 *
-* Description:														
+* Description:
 *	This function to send SSDP advertisements, replies and shutdown messages.
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int AdvertiseAndReply(IN int AdFlag, 
-					IN UpnpDevice_Handle Hnd, 
-					IN enum SsdpSearchType SearchType, 
-					IN struct sockaddr_in *DestAddr,
-                    IN char *DeviceType, 
-					IN char *DeviceUDN, 
-                    IN char *ServiceType, int Exp);
+int AdvertiseAndReply(
+	IN int AdFlag, 
+	IN UpnpDevice_Handle Hnd, 
+	IN enum SsdpSearchType SearchType, 
+	IN struct sockaddr_in *DestAddr,
+	IN char *DeviceType, 
+	IN char *DeviceUDN, 
+	IN char *ServiceType, int Exp);

 #endif

--- a/upnp/src/inc/unixutil.h
+++ b/upnp/src/inc/unixutil.h
@@ -36,12 +36,11 @@

 #include <sys/types.h>
 #ifndef WIN32
- #include <sys/socket.h>
+	#include <sys/socket.h>
 #else
- #define XINLINE
-
- typedef int socklen_t;
- #define EAFNOSUPPORT 97
+	typedef int socklen_t;
+	#define EAFNOSUPPORT 97
 #endif

 #endif // GENLIB_NET_UNIXUTIL_H
+
--- a/upnp/src/inc/upnpapi.h
+++ b/upnp/src/inc/upnpapi.h
@@ -71,33 +71,46 @@ struct Handle_Info
    Upnp_FunPtr  Callback; // Callback function pointer.
    char * Cookie;

-    DEVICEONLY(char  DescURL[LINE_SIZE];)   // URL for the use of SSDP
-    DEVICEONLY(char  DescXML[LINE_SIZE];)   // XML file path for device 
-                                            //description
+    // Device Only
+#ifdef INCLUDE_DEVICE_APIS
+    char  DescURL[LINE_SIZE];   // URL for the use of SSDP
+    char  DescXML[LINE_SIZE];   // XML file path for device 
+                                //description

-    DEVICEONLY(int MaxAge;)                 // Advertisement timeout
-    DEVICEONLY(IXML_Document *DescDocument;)     // Description parsed in 
-                                            //terms of DOM document 
-    DEVICEONLY(IXML_NodeList *DeviceList;)       // List of devices in the 
-                                            //description document
-    DEVICEONLY(IXML_NodeList *ServiceList;)      // List of services in the 
-                                            // description document
-    DEVICEONLY(service_table ServiceTable;) //table holding subscriptions and 
+    int MaxAge;                 // Advertisement timeout
+    IXML_Document *DescDocument;// Description parsed in 
+                                //terms of DOM document 
+    IXML_NodeList *DeviceList;  // List of devices in the 
+                                //description document
+    IXML_NodeList *ServiceList; // List of services in the 
+                                // description document
+    service_table ServiceTable; //table holding subscriptions and 
                                //URL information
-    DEVICEONLY(int MaxSubscriptions;)
-    DEVICEONLY(int MaxSubscriptionTimeOut;)
+    int MaxSubscriptions;
+    int MaxSubscriptionTimeOut;
+#endif
     
-       //Client only
-    CLIENTONLY(client_subscription * ClientSubList;) //client subscription list
-    CLIENTONLY(LinkedList SsdpSearchList;) // active ssdp searches   
+    // Client only
+#ifdef INCLUDE_CLIENT_APIS
+    client_subscription *ClientSubList; //client subscription list
+    LinkedList SsdpSearchList; // active ssdp searches   
+#endif
    int   aliasInstalled;       // 0 = not installed; otherwise installed
-} ;
+};

 extern ithread_mutex_t GlobalHndMutex;
 Upnp_Handle_Type GetHandleInfo(int Hnd, struct Handle_Info **HndInfo); 

-#define HandleLock()  DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"Trying Lock")); ithread_mutex_lock(&GlobalHndMutex); DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"LOCK"));
-#define HandleUnlock() DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"Trying Unlock")); ithread_mutex_unlock(&GlobalHndMutex); DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"Unlock"));
+#define HandleLock()  \
+	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying Lock"); \
+	ithread_mutex_lock(&GlobalHndMutex); \
+	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "LOCK");
+
+#define HandleUnlock() \
+	UpnpPrintf(UPNP_INFO, API,__FILE__, __LINE__, "Trying Unlock"); \
+	ithread_mutex_unlock(&GlobalHndMutex); \
+	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Unlock");
+
 Upnp_Handle_Type GetClientHandleInfo(int *client_handle_out, 
                                     struct Handle_Info **HndInfo);
 Upnp_Handle_Type GetDeviceHandleInfo(int *device_handle_out, 
@@ -111,7 +124,7 @@ extern unsigned short LOCAL_PORT;
 extern TimerThread gTimerThread;
 extern ThreadPool gRecvThreadPool;
 extern ThreadPool gSendThreadPool;
-
+extern ThreadPool gMiniServerThreadPool;

 typedef enum {
    SUBSCRIBE,
@@ -163,7 +176,6 @@ void UpnpThreadDistribution(struct UpnpNonblockParam * Param);
 void AutoAdvertise(void *input); 
 int getlocalhostname(char *out);

-virtualDirList *pVirtualDirList;
 extern WebServerState bWebServerState;

 #endif
--- a/upnp/src/inc/uri.h
+++ b/upnp/src/inc/uri.h
@@ -87,7 +87,7 @@ enum uriType  { absolute, relative };
 *	holds a pointer into a larger array									*/
 typedef struct TOKEN {
  const char *buff;
-  int size;
+  size_t size;
 } token;


@@ -124,7 +124,7 @@ typedef struct URL_LIST {
 *	Parameters :
 *		char * in ;	string of characters
 *		int index ;	index at which to start checking the characters
-*		int *max ;	
+*		size_t *max ;	
 *
 *	Description : Replaces an escaped sequence with its unescaped version 
 *		as in http://www.ietf.org/rfc/rfc2396.txt  (RFC explaining URIs)
@@ -137,7 +137,7 @@ typedef struct URL_LIST {
 *		string are shifted over, and NULL characters are placed at the 
 *		end of the string.
 ************************************************************************/
-int replace_escaped(char * in, int index, int *max);
+int replace_escaped(char * in, int index, size_t *max);

 /************************************************************************
 *	Function :	copy_URL_list
@@ -182,13 +182,16 @@ void free_URL_list(URL_list * list);
 *		uri_type *in ;	URI object
 *
 *	Description : Function useful in debugging for printing a parsed uri.
-*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-DBGONLY(void print_uri( uri_type *in);)
+#ifdef DEBUG
+void print_uri(uri_type *in);
+#else
+static UPNP_INLINE void print_uri(uri_type *in) {}
+#endif

 /************************************************************************
 *	Function :	print_token
@@ -197,13 +200,16 @@ DBGONLY(void print_uri( uri_type *in);)
 *		token * in ;	
 *
 *	Description : Function useful in debugging for printing a token.
-*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-void print_token(  token * in);
+#ifdef DEBUG
+void print_token(token *in);
+#else
+static UPNP_INLINE void print_token(token * in) {}
+#endif

 /************************************************************************
 *	Function :	token_string_casecmp
@@ -303,7 +309,7 @@ int parse_hostport(const char *in, int max, hostport_type *out );
 *
 *	Parameters :
 *		INOUT char *in ;	string of characters to be modified
-*		INOUT int *size ;	size limit for the number of characters
+*		INOUT size_t *size ;	size limit for the number of characters
 *
 *	Description : removes http escaped characters such as: "%20" and 
 *		replaces them with their character representation. i.e. 
@@ -315,7 +321,7 @@ int parse_hostport(const char *in, int max, hostport_type *out );
 *
 *	Note :
 ************************************************************************/
-int remove_escaped_chars(char *in,int *size);
+int remove_escaped_chars(char *in, size_t *size);

 /************************************************************************
 *	Function :	remove_dots
--- a/upnp/src/inc/util.h
+++ b/upnp/src/inc/util.h
@@ -47,12 +47,6 @@
 #endif


-#ifdef NO_DEBUG
-#define DBG(x)
-#else
-#define DBG(x) x
-#endif
-
 #define GEMD_OUT_OF_MEMORY -1
 #define EVENT_TIMEDOUT -2
 #define EVENT_TERMINATE	-3
@@ -142,31 +136,28 @@ void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen
 #endif

 //////////////////////////////////
-
 // C specific
 #ifndef __cplusplus

-#ifndef WIN32
- #define		XINLINE inline
-#else
+#ifdef WIN32
+	#ifndef S_ISREG
+		#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+	#endif

- #ifndef S_ISREG
- #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
- #endif
- 
- #ifndef S_ISDIR
- #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
- #endif
+	#ifndef S_ISDIR
+		#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+	#endif

- #define EADDRINUSE WSAEADDRINUSE
+	#define EADDRINUSE WSAEADDRINUSE

- #define strcasecmp stricmp
- #define strncasecmp strnicmp
+	#define strcasecmp stricmp
+	#define strncasecmp strnicmp

- #define sleep Sleep
- #define usleep(a) Sleep((a)/1000)
+	#define sleep(a) Sleep((a)*1000)
+	#define usleep(a) Sleep((a)/1000)
 #endif

 #endif // __cplusplus

 #endif /* GENLIB_UTIL_UTIL_H */
+
--- a/upnp/src/soap/soap_ctrlpt.c
+++ b/upnp/src/soap/soap_ctrlpt.c
@@ -244,7 +244,7 @@ get_node_value( IN IXML_Node * node )
 *
 *	Note :
 ****************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 get_host_and_path( IN char *ctrl_url,
                   OUT const memptr *host,
                   OUT const memptr *path,
@@ -277,7 +277,7 @@ get_host_and_path( IN char *ctrl_url,
 *
 *	Note :
 ****************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 get_action_name( IN char *action,
                 OUT memptr * name )
 {
@@ -303,7 +303,7 @@ get_action_name( IN char *action,
 *
 *	Note :
 ****************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 add_man_header( INOUT membuffer * headers )
 {
    char *soap_action_hdr;
@@ -611,19 +611,18 @@ SoapSendAction( IN char *action_url,
    char *xml_end =
        "</s:Body>\r\n"
        "</s:Envelope>\r\n\r\n";
-    int xml_start_len;
-    int xml_end_len;
-    int action_str_len;
+    size_t xml_start_len;
+    size_t xml_end_len;
+    size_t action_str_len;

    *response_node = NULL;      // init

    err_code = UPNP_E_OUTOF_MEMORY; // default error

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "Inside SoapSendAction():" );
-         )
-        // init
-        membuffer_init( &request );
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+        "Inside SoapSendAction():" );
+    // init
+    membuffer_init( &request );
    membuffer_init( &responsename );

    // print action
@@ -642,11 +641,12 @@ SoapSendAction( IN char *action_url,
        goto error_handler;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "path=%.*s, hostport=%.*s\n",
-                         url.pathquery.size, url.pathquery.buff,
-                         url.hostport.text.size,
-                         url.hostport.text.buff ); )
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+        "path=%.*s, hostport=%.*s\n",
+        (int)url.pathquery.size,
+        url.pathquery.buff,
+        (int)url.hostport.text.size,
+        url.hostport.text.buff );

    xml_start_len = strlen( xml_start );
    xml_end_len = strlen( xml_end );
@@ -693,7 +693,7 @@ SoapSendAction( IN char *action_url,
        err_code = ret_code;
    }

-  error_handler:
+error_handler:
    ixmlFreeDOMString( action_str );
    membuffer_destroy( &request );
    membuffer_destroy( &responsename );
@@ -757,24 +757,23 @@ SoapSendActionEx( IN char *action_url,
    char *xml_end =
        "</s:Body>\r\n"
        "</s:Envelope>\r\n";
-    int xml_start_len;
-    int xml_header_start_len;
-    int xml_header_str_len;
-    int xml_header_end_len;
-    int xml_body_start_len;
-    int action_str_len;
-    int xml_end_len;
+    size_t xml_start_len;
+    size_t xml_header_start_len;
+    size_t xml_header_str_len;
+    size_t xml_header_end_len;
+    size_t xml_body_start_len;
+    size_t action_str_len;
+    size_t xml_end_len;
    off_t content_length;

    *response_node = NULL;      // init

    err_code = UPNP_E_OUTOF_MEMORY; // default error

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "Inside SoapSendActionEx():" );
-         )
-        // init
-        membuffer_init( &request );
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+        "Inside SoapSendActionEx():" );
+    // init
+    membuffer_init( &request );
    membuffer_init( &responsename );

    // header string
@@ -798,11 +797,12 @@ SoapSendActionEx( IN char *action_url,
        goto error_handler;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "path=%.*s, hostport=%.*s\n",
-                         url.pathquery.size, url.pathquery.buff,
-                         url.hostport.text.size,
-                         url.hostport.text.buff ); )
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+        "path=%.*s, hostport=%.*s\n",
+        (int)url.pathquery.size,
+        url.pathquery.buff,
+        (int)url.hostport.text.size,
+        url.hostport.text.buff );

    xml_start_len = strlen( xml_start );
    xml_body_start_len = strlen( xml_body_start );
@@ -821,7 +821,7 @@ SoapSendActionEx( IN char *action_url,
        xml_body_start_len + action_str_len + xml_end_len;
    if (http_MakeMessage(
        &request, 1, 1,
-        "q" "N" "s" "sssbsc" "Uc" "bbbbbbb",
+        "q" "N" "s" "sssbsc" "Uc" "b" "b" "b" "b" "b" "b" "b",
        SOAPMETHOD_POST, &url,
        content_length,
        ContentTypeHeader,
--- a/upnp/src/soap/soap_device.c
+++ b/upnp/src/soap/soap_device.c
@@ -85,7 +85,7 @@ const char *ContentTypeHeader =
 *		0 if successful else returns appropriate error.
 *	Note :
 ****************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 get_request_type( IN http_message_t * request,
                  OUT memptr * action_name )
 {
@@ -262,7 +262,7 @@ send_error_response( IN SOCKINFO * info,
 *
 *	Note :
 ****************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 send_var_query_response( IN SOCKINFO * info,
                         IN const char *var_value,
                         IN http_message_t * hmsg )
@@ -326,12 +326,12 @@ send_var_query_response( IN SOCKINFO * info,
 *	Description :	This function separates the action node from 
 *	the root DOM node.
 *
-*	Return :	static XINLINE int
+*	Return :	static UPNP_INLINE int
 *		0 if successful, or -1 if fails.
 *
 *	Note :
 ****************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 get_action_node( IN IXML_Document * TempDoc,
                 IN char *NodeName,
                 OUT IXML_Document ** RespNode )
@@ -344,11 +344,10 @@ get_action_node( IN IXML_Document * TempDoc,
    int ret_code = -1;          // error, by default
    IXML_NodeList *nl = NULL;

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "get_action_node(): node name =%s\n ", NodeName );
-         )
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+        "get_action_node(): node name =%s\n ", NodeName );

-        * RespNode = NULL;
+    *RespNode = NULL;

    // Got the Envelope node here
    EnvpNode = ixmlNode_getFirstChild( ( IXML_Node * ) TempDoc );
@@ -682,7 +681,7 @@ get_device_info( IN http_message_t * request,
 *
 *	Note :
 ****************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 send_action_response( IN SOCKINFO * info,
                      IN IXML_Document * action_resp,
                      IN http_message_t * request )
@@ -738,15 +737,15 @@ send_action_response( IN SOCKINFO * info,
                                 xml_response, strlen( xml_response ),
                                 end_body, strlen( end_body ) );

-    DBGONLY( if( ret_code != 0 ) {
-             UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "Failed to send response: err code = %d\n",
-                         ret_code );}
-     )
+    if( ret_code != 0 ) {
+        UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+            "Failed to send response: err code = %d\n",
+            ret_code );
+    }

-        err_code = 0;
+    err_code = 0;

-  error_handler:
+error_handler:
    ixmlFreeDOMString( xml_response );
    membuffer_destroy( &headers );
    if( err_code != 0 ) {
@@ -770,7 +769,7 @@ send_action_response( IN SOCKINFO * info,
 *		returns 0 if successful else returns -1.
 *	Note :
 ****************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 get_var_name( IN IXML_Document * TempDoc,
              OUT char *VarName )
 {
@@ -814,14 +813,13 @@ get_var_name( IN IXML_Document * TempDoc,
    Temp = ixmlNode_getNodeValue( VarNode );
    linecopy( VarName, Temp );

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "Received query for variable  name %s\n",
-                         VarName );
-         )
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+        "Received query for variable  name %s\n",
+        VarName );

-        ret_val = 0;            // success
+    ret_val = 0;            // success

-  error_handler:
+error_handler:
    return ret_val;
 }

@@ -842,7 +840,7 @@ get_var_name( IN IXML_Document * TempDoc,
 *
 *	Note :
 ****************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 handle_query_variable( IN SOCKINFO * info,
                       IN http_message_t * request,
                       IN IXML_Document * xml_doc )
@@ -878,8 +876,8 @@ handle_query_variable( IN SOCKINFO * info,
    // send event
    soap_event_callback( UPNP_CONTROL_GET_VAR_REQUEST, &variable, cookie );

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "Return from callback for var request\n" ) );
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+        "Return from callback for var request\n" );

    // validate, and handle result
    if( variable.CurrentVal == NULL ) {
@@ -968,8 +966,8 @@ handle_invoke_action( IN SOCKINFO * info,
    action.ErrCode = UPNP_E_SUCCESS;
    action.CtrlPtIPAddr = info->foreign_ip_addr;

-    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "Calling Callback\n" ) );
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+                         "Calling Callback\n" );

    soap_event_callback( UPNP_CONTROL_ACTION_REQUEST, &action, cookie );

--- a/upnp/src/ssdp/ssdp_ctrlpt.c
+++ b/upnp/src/ssdp/ssdp_ctrlpt.c
@@ -55,12 +55,12 @@


 /************************************************************************
-* Function : send_search_result											
-*																	
-* Parameters:														
+* Function : send_search_result
+*
+* Parameters:
 *	IN void *data: Search reply from the device
-*																	
-* Description:														
+*
+* Description:
 *	This function sends a callback to the control point application with 
 *	a SEARCH result
 *
@@ -125,16 +125,16 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,

    // we are assuming that there can be only one client supported at a time

-    HandleLock(  );
+    HandleLock();

    if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }
    // copy
    ctrlpt_callback = ctrlpt_info->Callback;
    ctrlpt_cookie = ctrlpt_info->Cookie;
-    HandleUnlock(  );
+    HandleUnlock();

    // search timeout
    if( timeout ) {
@@ -159,7 +159,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
    }

    // dest addr
-    param.DestAddr = dest_addr;
+    memcpy(&param.DestAddr, dest_addr, sizeof(struct sockaddr_in) );

    // EXT
    param.Ext[0] = '\0';
@@ -267,22 +267,22 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
            strlen( param.Location ) == 0 || !usn_found || !st_found ) {
            return;             // bad reply
        }
-        //check each current search
-        HandleLock(  );
+        // check each current search
+        HandleLock();
        if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
-            HandleUnlock(  );
+            HandleUnlock();
            return;
        }
        node = ListHead( &ctrlpt_info->SsdpSearchList );

-        //temporary add null termination
+        // temporary add null termination
        //save_char = hdr_value.buf[ hdr_value.length ];
        //hdr_value.buf[ hdr_value.length ] = '\0';

        while( node != NULL ) {
            searchArg = node->item;
            matched = 0;
-            //check for match of ST header and search target
+            // check for match of ST header and search target
            switch ( searchArg->requestType ) {
                case SSDP_ALL:
                    {
@@ -327,7 +327,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
            }

            if( matched ) {
-                //schedule call back
+                // schedule call back
                threadData =
                    ( ResultData * ) malloc( sizeof( ResultData ) );
                if( threadData != NULL ) {
@@ -344,28 +344,30 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
            node = ListNext( &ctrlpt_info->SsdpSearchList, node );
        }

-        HandleUnlock(  );
+        HandleUnlock();
        //ctrlpt_callback( UPNP_DISCOVERY_SEARCH_RESULT, &param, cookie );
    }
 }

 /************************************************************************
-* Function : process_reply											
-*																	
-* Parameters:														
-*		IN char* request_buf: the response came from the device
-*		IN int buf_len: The length of the response buffer
-*	    IN struct sockaddr_in* dest_addr: The address of the device
-*		IN void *cookie : cookie passed by the control point application
-*							at the time of sending search message
+* Function : process_reply
 *
-* Description:														
+* Parameters:
+*	IN char* request_buf: the response came from the device
+*	IN int buf_len: The length of the response buffer
+*	IN struct sockaddr_in* dest_addr: The address of the device
+*	IN void *cookie : cookie passed by the control point application
+*		at the time of sending search message
+*
+* Description:
 *	This function processes reply recevied from a search
 *
 * Returns: void
 *
 ***************************************************************************/
-static XINLINE void
+#warning There are currently no uses of the function 'process_reply()' in the code.
+#warning 'process_reply()' is a candidate for removal.
+static UPNP_INLINE void
 process_reply( IN char *request_buf,
               IN int buf_len,
               IN struct sockaddr_in *dest_addr,
@@ -388,17 +390,17 @@ process_reply( IN char *request_buf,
 }

 /************************************************************************
-* Function : CreateClientRequestPacket											
-*																	
-* Parameters:														
-*		IN char * RqstBuf:Output string in HTTP format.
-*		IN char *SearchTarget:Search Target
-*	    IN int Mx dest_addr: Number of seconds to wait to 
-*							collect all the responses
+* Function : CreateClientRequestPacket
 *
-* Description:														
+* Parameters:
+*	IN char * RqstBuf:Output string in HTTP format.
+*	IN char *SearchTarget:Search Target
+*	IN int Mx dest_addr: Number of seconds to wait to 
+*		collect all the responses
+*
+* Description:
 *	This function creates a HTTP search request packet 
-* depending on the input parameter.
+* 	depending on the input parameter.
 *
 * Returns: void
 *
@@ -430,12 +432,12 @@ CreateClientRequestPacket( IN char *RqstBuf,
 }

 /************************************************************************
-* Function : searchExpired											
-*																	
-* Parameters:														
+* Function : searchExpired
+*
+* Parameters:
 *		IN void * arg:
 *
-* Description:														
+* Description:
 *	This function 
 *
 * Returns: void
@@ -456,13 +458,13 @@ searchExpired( void *arg )
    void *cookie = NULL;
    int found = 0;

-    HandleLock(  );
+    HandleLock();

    //remove search target from search list

    if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
        free( id );
-        HandleUnlock(  );
+        HandleUnlock();
        return;
    }

@@ -483,7 +485,7 @@ searchExpired( void *arg )
        }
        node = ListNext( &ctrlpt_info->SsdpSearchList, node );
    }
-    HandleUnlock(  );
+    HandleUnlock();

    if( found ) {
        ctrlpt_callback( UPNP_DISCOVERY_SEARCH_TIMEOUT, NULL, cookie );
@@ -536,11 +538,10 @@ SearchByTarget( IN int Mx,
    if( ReqBuf == NULL )
        return UPNP_E_OUTOF_MEMORY;

-    DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                         ">>> SSDP SEND >>>\n%s\n", ReqBuf );
-         )
+    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+        ">>> SSDP SEND >>>\n%s\n", ReqBuf );

-        timeTillRead = Mx;
+    timeTillRead = Mx;

    if( timeTillRead < MIN_SEARCH_TIME ) {
        timeTillRead = MIN_SEARCH_TIME;
@@ -559,9 +560,9 @@ SearchByTarget( IN int Mx,
    FD_SET( gSsdpReqSocket, &wrSet );

    //add search criteria to list
-    HandleLock(  );
+    HandleLock();
    if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
-        HandleUnlock(  );
+        HandleUnlock();
        free( ReqBuf );
        return UPNP_E_INTERNAL_ERROR;
    }
@@ -582,33 +583,30 @@ SearchByTarget( IN int Mx,
    newArg->timeoutEventId = ( *id );

    ListAddTail( &ctrlpt_info->SsdpSearchList, newArg );
-    HandleUnlock(  );
+    HandleUnlock();

    setsockopt( gSsdpReqSocket, IPPROTO_IP, IP_MULTICAST_IF,
                ( char * )&addr, sizeof( addr ) );

    if( select( gSsdpReqSocket + 1, NULL, &wrSet, NULL, NULL )
        == UPNP_SOCKETERROR ) {
-        DBGONLY( if( errno == EBADF ) {
-                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                             "SSDP_LIB :RequestHandler:An invalid file descriptor"
-                             " was givenin one of the sets. \n" );}
-                 else
-                 if( errno == EINTR ) {
-                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                             "SSDP_LIB :RequestHandler:  A non blocked "
-                             "signal was caught.    \n" );}
-                 else
-                 if( errno == EINVAL ) {
-                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                             "SSDP_LIB :RequestHandler: n is negative.  \n" );}
-                 else
-                 if( errno == ENOMEM ) {
-                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                             "SSDP_LIB : RequestHandler:select was unable to "
-                             "allocate memory for internal tables.\n" );}
- )
-shutdown( gSsdpReqSocket, SD_BOTH );
+        if( errno == EBADF ) {
+            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                "SSDP_LIB :RequestHandler:An invalid file descriptor"
+                " was givenin one of the sets. \n" );
+        } else if( errno == EINTR ) {
+            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                "SSDP_LIB :RequestHandler:  A non blocked "
+                "signal was caught.    \n" );
+        } else if( errno == EINVAL ) {
+            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                "SSDP_LIB :RequestHandler: n is negative.  \n" );
+        } else if( errno == ENOMEM ) {
+            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                "SSDP_LIB : RequestHandler:select was unable to "
+                "allocate memory for internal tables.\n" );
+        }
+	shutdown( gSsdpReqSocket, SD_BOTH );
        UpnpCloseSocket( gSsdpReqSocket );
        free( ReqBuf );
        return UPNP_E_INTERNAL_ERROR;
--- a/upnp/src/ssdp/ssdp_device.c
+++ b/upnp/src/ssdp/ssdp_device.c
@@ -43,22 +43,22 @@
 #include "unixutil.h"

 #ifdef WIN32
- #include <ws2tcpip.h>
- #include <winsock2.h>
+	#include <ws2tcpip.h>
+	#include <winsock2.h>
 #endif

-#define MSGTYPE_SHUTDOWN		0
+#define MSGTYPE_SHUTDOWN	0
 #define MSGTYPE_ADVERTISEMENT	1
-#define MSGTYPE_REPLY			2
+#define MSGTYPE_REPLY		2

 /************************************************************************
-* Function : advertiseAndReplyThread									
-*																	
-* Parameters:														
-*		IN void *data: Structure containing the search request
+* Function : advertiseAndReplyThread
 *
-* Description:														
-*	This function is a wrapper function to reply the search request 
+* Parameters:
+*	IN void *data: Structure containing the search request
+*
+* Description:
+*	This function is a wrapper function to reply the search request
 *	coming from the control point.
 *
 * Returns: void *
@@ -81,11 +81,11 @@ advertiseAndReplyThread( IN void *data )
 }

 /************************************************************************
-* Function : ssdp_handle_device_request									
-*																	
+* Function : ssdp_handle_device_request
+*
 * Parameters:														
-*		IN http_message_t* hmsg: SSDP search request from the control point
-*		IN struct sockaddr_in* dest_addr: The address info of control point
+*	IN http_message_t* hmsg: SSDP search request from the control point
+*	IN struct sockaddr_in* dest_addr: The address info of control point
 *
 * Description:														
 *	This function handles the search request. It do the sanity checks of
@@ -95,6 +95,7 @@ advertiseAndReplyThread( IN void *data )
 * Returns: void *
 *	1 if successful else appropriate error
 ***************************************************************************/
+#ifdef INCLUDE_DEVICE_APIS
 void
 ssdp_handle_device_request( IN http_message_t * hmsg,
                            IN struct sockaddr_in *dest_addr )
@@ -135,30 +136,30 @@ ssdp_handle_device_request( IN http_message_t * hmsg,
        return;                 // bad ST header
    }

-    HandleLock(  );
+    HandleLock();
    // device info
    if( GetDeviceHandleInfo( &handle, &dev_info ) != HND_DEVICE ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return;                 // no info found
    }
    maxAge = dev_info->MaxAge;
-    HandleUnlock(  );
+    HandleUnlock();

-    DBGONLY( UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-                         "ssdp_handle_device_request with Cmd %d SEARCH\n",
-                         event.Cmd );
-             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-                         "MAX-AGE     =  %d\n", maxAge );
-             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-                         "MX     =  %d\n", event.Mx );
-             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-                         "DeviceType   =  %s\n", event.DeviceType );
-             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-                         "DeviceUuid   =  %s\n", event.UDN );
-             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-                         "ServiceType =  %s\n", event.ServiceType ); )
+    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+        "ssdp_handle_device_request with Cmd %d SEARCH\n",
+        event.Cmd );
+    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+        "MAX-AGE     =  %d\n", maxAge );
+    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+        "MX     =  %d\n", event.Mx );
+    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+        "DeviceType   =  %s\n", event.DeviceType );
+    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+        "DeviceUuid   =  %s\n", event.UDN );
+    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+        "ServiceType =  %s\n", event.ServiceType );

-        threadArg =
+    threadArg =
        ( SsdpSearchReply * ) malloc( sizeof( SsdpSearchReply ) );

    if( threadArg == NULL ) {
@@ -185,11 +186,12 @@ ssdp_handle_device_request( IN http_message_t * hmsg,
        mx = 1;
    }

-    replyTime = rand(  ) % mx;
+    replyTime = rand() % mx;

    TimerThreadSchedule( &gTimerThread, replyTime, REL_SEC, &job,
                         SHORT_TERM, NULL );
 }
+#endif

 /************************************************************************
 * Function : NewRequestHandler									
@@ -220,9 +222,9 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,

    ReplySock = socket( AF_INET, SOCK_DGRAM, 0 );
    if( ReplySock == UPNP_INVALID_SOCKET ) {
-        DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                             "SSDP_LIB: New Request Handler:"
-                             "Error in socket operation !!!\n" ) );
+        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            "SSDP_LIB: New Request Handler:"
+            "Error in socket operation !!!\n" );

        return UPNP_E_OUTOF_SOCKET;
    }
@@ -247,13 +249,12 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
        // So, NUM_COPY has been changed from 2 to 1.
        NumCopy = 0;
        while( NumCopy < NUM_COPY ) {
-            DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                                 ">>> SSDP SEND >>>\n%s\n",
-                                 *( RqPacket + Index ) );
-                 )
-                rc = sendto( ReplySock, *( RqPacket + Index ),
-                             strlen( *( RqPacket + Index ) ),
-                             0, ( struct sockaddr * )DestAddr, socklen );
+            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                ">>> SSDP SEND >>>\n%s\n",
+                *( RqPacket + Index ) );
+            rc = sendto( ReplySock, *( RqPacket + Index ),
+                         strlen( *( RqPacket + Index ) ),
+                         0, ( struct sockaddr * )DestAddr, socklen );
            imillisleep( SSDP_PAUSE );
            ++NumCopy;
        }
@@ -388,11 +389,10 @@ DeviceAdvertisement( IN char *DevType,
    char *msgs[3];
    int ret_code;

-    DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                         "In function SendDeviceAdvertisemenrt\n" );
-         )
+    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+        "In function SendDeviceAdvertisemenrt\n" );

-        DestAddr.sin_family = AF_INET;
+    DestAddr.sin_family = AF_INET;
    DestAddr.sin_addr.s_addr = inet_addr( SSDP_IP );
    DestAddr.sin_port = htons( SSDP_PORT );

@@ -783,11 +783,11 @@ DeviceShutdown( IN char *DevType,
                             Mil_Usn, Location, Duration, &msgs[0] );
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                         "In function DeviceShutdown\n" ); )
-        // both root and sub-devices need to send these two messages
-        CreateServicePacket( MSGTYPE_SHUTDOWN, Udn, Udn,
-                             Location, Duration, &msgs[1] );
+    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+        "In function DeviceShutdown\n" );
+    // both root and sub-devices need to send these two messages
+    CreateServicePacket( MSGTYPE_SHUTDOWN, Udn, Udn,
+                         Location, Duration, &msgs[1] );

    sprintf( Mil_Usn, "%s::%s", Udn, DevType );
    CreateServicePacket( MSGTYPE_SHUTDOWN, DevType, Mil_Usn,
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -91,14 +91,14 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-     int AdvertiseAndReply( IN int AdFlag,
-                            IN UpnpDevice_Handle Hnd,
-                            IN enum SsdpSearchType SearchType,
-                            IN struct sockaddr_in *DestAddr,
-                            IN char *DeviceType,
-                            IN char *DeviceUDN,
-                            IN char *ServiceType,
-                            int Exp )
+int AdvertiseAndReply( IN int AdFlag,
+                       IN UpnpDevice_Handle Hnd,
+                       IN enum SsdpSearchType SearchType,
+                       IN struct sockaddr_in *DestAddr,
+                       IN char *DeviceType,
+                       IN char *DeviceUDN,
+                       IN char *ServiceType,
+                       int Exp )
 {
    int i,
      j;
@@ -115,14 +115,14 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
    const DOMString tmpStr;
    char SERVER[200];

-    DBGONLY( const DOMString dbgStr;
-             UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                         "Inside AdvertiseAndReply with AdFlag = %d\n",
-                         AdFlag ); )
+    const DOMString dbgStr;
+    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+        "Inside AdvertiseAndReply with AdFlag = %d\n",
+        AdFlag );

-        HandleLock(  );
+    HandleLock();
    if( GetHandleInfo( Hnd, &SInfo ) != HND_DEVICE ) {
-        HandleUnlock(  );
+        HandleUnlock();
        return UPNP_E_INVALID_HANDLE;
    }
    defaultExp = SInfo->MaxAge;
@@ -139,24 +139,20 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
    // parse the device list and send advertisements/replies 
    for( i = 0;; i++ ) {

-        DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                             "Entering new device list with i = %d\n\n",
-                             i );
-             )
+        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+            "Entering new device list with i = %d\n\n", i );

-            tmpNode = ixmlNodeList_item( SInfo->DeviceList, i );
+        tmpNode = ixmlNodeList_item( SInfo->DeviceList, i );
        if( tmpNode == NULL ) {
-            DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                                 "Exiting new device list with i = %d\n\n",
-                                 i );
-                 )
-                break;
+            UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                "Exiting new device list with i = %d\n\n", i );
+            break;
        }

-        DBGONLY( dbgStr = ixmlNode_getNodeName( tmpNode );
+        dbgStr = ixmlNode_getNodeName( tmpNode );
                 UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                             "Extracting device type once for %s\n",
-                             dbgStr ); )
+                     "Extracting device type once for %s\n",
+                     dbgStr );
            // extract device type 
            ixmlNodeList_free( nodeList );
        nodeList = NULL;
@@ -167,15 +163,14 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
            continue;
        }

-        DBGONLY( dbgStr = ixmlNode_getNodeName( tmpNode );
-                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                             "Extracting UDN for %s\n", dbgStr ); )
+        dbgStr = ixmlNode_getNodeName( tmpNode );
+        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+            "Extracting UDN for %s\n", dbgStr );

-            DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                                 "Extracting device type\n" );
-             )
+        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+            "Extracting device type\n" );

-            tmpNode2 = ixmlNodeList_item( nodeList, 0 );
+        tmpNode2 = ixmlNodeList_item( nodeList, 0 );
        if( tmpNode2 == NULL ) {
            continue;
        }
@@ -184,11 +179,10 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
            continue;
        }

-        DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                             "Extracting device type \n" );
-             )
+        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+            "Extracting device type \n" );

-            tmpStr = ixmlNode_getNodeValue( textNode );
+        tmpStr = ixmlNode_getNodeValue( textNode );
        if( tmpStr == NULL ) {
            continue;
        }
@@ -198,47 +192,41 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
            continue;
        }

-        DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                             "Extracting device type = %s\n", devType );
-                 if( tmpNode == NULL ) {
-                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                             "TempNode is NULL\n" );}
-                 dbgStr = ixmlNode_getNodeName( tmpNode );
-                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                             "Extracting UDN for %s\n", dbgStr ); )
-            // extract UDN 
-            ixmlNodeList_free( nodeList );
+        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+            "Extracting device type = %s\n", devType );
+        if( tmpNode == NULL ) {
+            UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                "TempNode is NULL\n" );
+	}
+        dbgStr = ixmlNode_getNodeName( tmpNode );
+        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+            "Extracting UDN for %s\n", dbgStr );
+        // extract UDN 
+        ixmlNodeList_free( nodeList );
        nodeList = NULL;
        nodeList = ixmlElement_getElementsByTagName( ( IXML_Element * )
                                                     tmpNode, "UDN" );
        if( nodeList == NULL ) {
-
-            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
-                                 __LINE__, "UDN not found!!!\n" );
-                 )
+            UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
+                __LINE__, "UDN not found!!!\n" );
                continue;
        }
        tmpNode2 = ixmlNodeList_item( nodeList, 0 );
        if( tmpNode2 == NULL ) {
-
-            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
-                                 __LINE__, "UDN not found!!!\n" );
-                 )
-                continue;
+            UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
+                __LINE__, "UDN not found!!!\n" );
+            continue;
        }
        textNode = ixmlNode_getFirstChild( tmpNode2 );
        if( textNode == NULL ) {
-
-            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
-                                 __LINE__, "UDN not found!!!\n" );
-                 )
-                continue;
+            UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
+                __LINE__, "UDN not found!!!\n" );
+            continue;
        }
        tmpStr = ixmlNode_getNodeValue( textNode );
        if( tmpStr == NULL ) {
-            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__, __LINE__,
-                                 "UDN not found!!!!\n" );
-                 )
+            UpnpPrintf( UPNP_CRITICAL, API, __FILE__, __LINE__,
+                "UDN not found!!!!\n" );
                continue;
        }
        strcpy( UDNstr, tmpStr );
@@ -246,9 +234,8 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
            continue;
        }

-        DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                             "Sending UDNStr = %s \n", UDNstr );
-             )
+        UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+            "Sending UDNStr = %s \n", UDNstr );
            if( AdFlag ) {
            // send the device advertisement 
            if( AdFlag == 1 ) {
@@ -278,22 +265,16 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
                    {
                        if( DeviceUDN != NULL && strlen( DeviceUDN ) != 0 ) {
                            if( strcasecmp( DeviceUDN, UDNstr ) ) {
-                                DBGONLY( UpnpPrintf
-                                         ( UPNP_INFO, API, __FILE__,
-                                           __LINE__,
-                                           "DeviceUDN=%s and search "
-                                           "UDN=%s did not match\n",
-                                           UDNstr, DeviceUDN );
-                                     )
+                                UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                                    "DeviceUDN=%s and search "
+                                    "UDN=%s did not match\n",
+                                    UDNstr, DeviceUDN );
                                    break;
                            } else {
-                                DBGONLY( UpnpPrintf
-                                         ( UPNP_INFO, API, __FILE__,
-                                           __LINE__,
-                                           "DeviceUDN=%s and search "
-                                           "UDN=%s MATCH\n", UDNstr,
-                                           DeviceUDN );
-                                     )
+                                UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                                    "DeviceUDN=%s and search "
+                                    "UDN=%s MATCH\n", UDNstr,
+                                    DeviceUDN );
                                    SendReply( DestAddr, devType, 0,
                                               UDNstr, SInfo->DescURL,
                                               defaultExp, 0 );
@@ -306,25 +287,18 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
                        if( !strncasecmp
                            ( DeviceType, devType,
                              strlen( DeviceType ) ) ) {
-                            DBGONLY( UpnpPrintf
-                                     ( UPNP_INFO, API, __FILE__, __LINE__,
-                                       "DeviceType=%s and search devType=%s MATCH\n",
-                                       devType, DeviceType );
-                                 )
-                                SendReply( DestAddr, devType, 0, UDNstr,
-                                           SInfo->DescURL, defaultExp, 1 );
-                        }
-
-                        DBGONLY(
-                                    else
-                                    UpnpPrintf( UPNP_INFO, API, __FILE__,
-                                                __LINE__,
-                                                "DeviceType=%s and search devType=%s"
-                                                " DID NOT MATCH\n",
-                                                devType, DeviceType );
-                             )
-
-                            break;
+                            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                                "DeviceType=%s and search devType=%s MATCH\n",
+                                devType, DeviceType );
+                            SendReply( DestAddr, devType, 0, UDNstr,
+                                       SInfo->DescURL, defaultExp, 1 );
+                        } else {
+                            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                                "DeviceType=%s and search devType=%s"
+                                " DID NOT MATCH\n",
+                                devType, DeviceType );
+			}
+                        break;
                    }
                default:
                    break;
@@ -332,11 +306,10 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
        }
        // send service advertisements for services corresponding 
        // to the same device 
-        DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                             "Sending service Advertisement\n" );
-             )
+        UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+            "Sending service Advertisement\n" );

-            tmpNode = ixmlNodeList_item( SInfo->ServiceList, i );
+        tmpNode = ixmlNodeList_item( SInfo->ServiceList, i );
        if( tmpNode == NULL ) {
            continue;
        }
@@ -345,10 +318,9 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
        nodeList = ixmlElement_getElementsByTagName( ( IXML_Element * )
                                                     tmpNode, "service" );
        if( nodeList == NULL ) {
-            DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                                 "Service not found 3\n" );
-                 )
-                continue;
+            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                "Service not found 3\n" );
+            continue;
        }
        for( j = 0;; j++ ) {
            tmpNode = ixmlNodeList_item( nodeList, j );
@@ -357,15 +329,11 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;

            ixmlNodeList_free( tmpNodeList );
            tmpNodeList = NULL;
-            tmpNodeList = ixmlElement_getElementsByTagName( ( IXML_Element
-                                                              * ) tmpNode,
-                                                            "serviceType" );
-
+            tmpNodeList = ixmlElement_getElementsByTagName(
+                ( IXML_Element *)tmpNode, "serviceType" );
            if( tmpNodeList == NULL ) {
-                DBGONLY( UpnpPrintf
-                         ( UPNP_CRITICAL, API, __FILE__, __LINE__,
-                           "ServiceType not found \n" );
-                     )
+                UpnpPrintf( UPNP_CRITICAL, API, __FILE__, __LINE__,
+                    "ServiceType not found \n" );
                    continue;
            }
            tmpNode2 = ixmlNodeList_item( tmpNodeList, 0 );
@@ -386,19 +354,16 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
                continue;
            }

-            DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                                 "ServiceType = %s\n", servType );
-                 )
-                if( AdFlag ) {
+            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                "ServiceType = %s\n", servType );
+            if( AdFlag ) {
                if( AdFlag == 1 ) {
                    ServiceAdvertisement( UDNstr, servType,
                                          SInfo->DescURL, Exp );
-                } else          // AdFlag == -1
-                {
+                } else {         // AdFlag == -1
                    ServiceShutdown( UDNstr, servType,
                                     SInfo->DescURL, Exp );
                }
-
            } else {
                switch ( SearchType ) {
                    case SSDP_ALL:
@@ -433,11 +398,10 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
        ixmlNodeList_free( nodeList );
        nodeList = NULL;
    }
-    DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                         "Exiting AdvertiseAndReply : \n" );
-         )
+    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+        "Exiting AdvertiseAndReply : \n" );

-        HandleUnlock(  );
+    HandleUnlock(  );

    return UPNP_E_SUCCESS;

@@ -677,7 +641,7 @@ free_ssdp_event_handler_data( void *the_data )
 * Returns: xboolean
 *	returns TRUE if msg is valid else FALSE
 ***************************************************************************/
-static XINLINE xboolean
+static UPNP_INLINE xboolean
 valid_ssdp_msg( IN http_message_t * hmsg )
 {
    memptr hdr_value;
@@ -719,7 +683,7 @@ valid_ssdp_msg( IN http_message_t * hmsg )
 * Returns: int
 *	0 if successful -1 if error
 ***************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 start_event_handler( void *Data )
 {

@@ -733,20 +697,18 @@ start_event_handler( void *Data )
    if( status == PARSE_FAILURE ) {
        if( parser->msg.method != HTTPMETHOD_NOTIFY ||
            !parser->valid_ssdp_notify_hack ) {
-            DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                                 "SSDP recvd bad msg code = %d\n",
-                                 status );
-                 )
-                // ignore bad msg, or not enuf mem
-                goto error_handler;
+            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                "SSDP recvd bad msg code = %d\n",
+                status );
+            // ignore bad msg, or not enuf mem
+            goto error_handler;
        }
        // valid notify msg
    } else if( status != PARSE_SUCCESS ) {
-        DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                             "SSDP recvd bad msg code = %d\n", status );
-             )
+        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            "SSDP recvd bad msg code = %d\n", status );

-            goto error_handler;
+        goto error_handler;
    }
    // check msg
    if( !valid_ssdp_msg( &parser->msg ) ) {
@@ -784,14 +746,10 @@ ssdp_event_handler_thread( void *the_data )
    // send msg to device or ctrlpt
    if( ( hmsg->method == HTTPMETHOD_NOTIFY ) ||
        ( hmsg->request_method == HTTPMETHOD_MSEARCH ) ) {
-
        CLIENTONLY( ssdp_handle_ctrlpt_msg( hmsg, &data->dest_addr,
-                                            FALSE, NULL );
-             );
+                                            FALSE, NULL ););
    } else {
-
-        DEVICEONLY( ssdp_handle_device_request( hmsg, &data->dest_addr );
-             );
+        ssdp_handle_device_request( hmsg, &data->dest_addr );
    }

    // free data
@@ -863,21 +821,18 @@ readFromSSDPSocket( SOCKET socket )
    if( byteReceived > 0 ) {

        requestBuf[byteReceived] = '\0';
-        DBGONLY( UpnpPrintf( UPNP_INFO, SSDP,
+        UpnpPrintf( UPNP_INFO, SSDP,
                             __FILE__, __LINE__,
                             "Received response !!!  "
                             "%s From host %s \n",
                             requestBuf,
                             inet_ntoa( clientAddr.sin_addr ) );
-             )

-            DBGONLY( UpnpPrintf( UPNP_PACKET, SSDP,
-                                 __FILE__, __LINE__,
-                                 "Received multicast packet:"
-                                 "\n %s\n", requestBuf );
-             )
-            //add thread pool job to handle request
-            if( data != NULL ) {
+        UpnpPrintf( UPNP_PACKET, SSDP, __FILE__, __LINE__,
+            "Received multicast packet:"
+            "\n %s\n", requestBuf );
+        //add thread pool job to handle request
+        if( data != NULL ) {
            data->parser.msg.msg.length += byteReceived;
            // null-terminate
            data->parser.msg.msg.buf[byteReceived] = 0;
@@ -891,7 +846,6 @@ readFromSSDPSocket( SOCKET socket )
                free_ssdp_event_handler_data( data );
            }
        }
-
    } else {
        free_ssdp_event_handler_data( data );
    }
@@ -926,9 +880,9 @@ get_ssdp_sockets( MiniServerSockArray * out )

    CLIENTONLY( if( ( ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 ) )
                    == UPNP_INVALID_SOCKET ) {
-                DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-                                     SSDP, __FILE__, __LINE__,
-                                     "Error in socket operation !!!\n" ); )
+                UpnpPrintf( UPNP_CRITICAL,
+                    SSDP, __FILE__, __LINE__,
+                    "Error in socket operation !!!\n" );
                return UPNP_E_OUTOF_SOCKET;}
                setsockopt( ssdpReqSock,
                            IPPROTO_IP,
@@ -938,11 +892,10 @@ get_ssdp_sockets( MiniServerSockArray * out )

        if( ( ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 ) )
            == UPNP_INVALID_SOCKET ) {
-            DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-                                 SSDP, __FILE__, __LINE__,
-                                 "Error in socket operation !!!\n" );
-                 )
-                CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+            UpnpPrintf( UPNP_CRITICAL,
+                SSDP, __FILE__, __LINE__,
+                "Error in socket operation !!!\n" );
+            CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
            CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
            return UPNP_E_OUTOF_SOCKET;
        }
@@ -951,11 +904,10 @@ get_ssdp_sockets( MiniServerSockArray * out )
    if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEADDR,
                    ( char * )&onOff, sizeof( onOff ) ) != 0 ) {

-        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-                             SSDP, __FILE__, __LINE__,
-                             "Error in set reuse addr !!!\n" );
-             )
-            CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+        UpnpPrintf( UPNP_CRITICAL,
+            SSDP, __FILE__, __LINE__,
+            "Error in set reuse addr !!!\n" );
+        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
        shutdown( ssdpSock, SD_BOTH );
        UpnpCloseSocket( ssdpSock );
@@ -966,11 +918,10 @@ get_ssdp_sockets( MiniServerSockArray * out )
    if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
                    ( char * )&onOff, sizeof( onOff ) ) != 0 ) {

-        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-                             SSDP, __FILE__, __LINE__,
-                             "Error in set reuse port !!!\n" );
-             )
-            CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+        UpnpPrintf( UPNP_CRITICAL,
+            SSDP, __FILE__, __LINE__,
+            "Error in set reuse port !!!\n" );
+        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
        shutdown( ssdpSock, SD_BOTH );
        UpnpCloseSocket( ssdpSock );
@@ -986,10 +937,9 @@ get_ssdp_sockets( MiniServerSockArray * out )
    if( bind
        ( ssdpSock, ( struct sockaddr * )&ssdpAddr,
          sizeof( ssdpAddr ) ) != 0 ) {
-        DBGONLY( UpnpPrintf
-                 ( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-                   "Error in binding !!!\n" );
-             )
+        UpnpPrintf( UPNP_CRITICAL,
+            SSDP, __FILE__, __LINE__,
+            "Error in binding !!!\n" );
            shutdown( ssdpSock, SD_BOTH );
        UpnpCloseSocket( ssdpSock );
        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
@@ -1003,11 +953,10 @@ get_ssdp_sockets( MiniServerSockArray * out )
    if( setsockopt( ssdpSock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
                    ( char * )&ssdpMcastAddr,
                    sizeof( struct ip_mreq ) ) != 0 ) {
-        DBGONLY( UpnpPrintf
-                 ( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-                   "Error in joining" " multicast group !!!\n" );
-             )
-            shutdown( ssdpSock, SD_BOTH );
+        UpnpPrintf( UPNP_CRITICAL,
+            SSDP, __FILE__, __LINE__,
+            "Error in joining" " multicast group !!!\n" );
+        shutdown( ssdpSock, SD_BOTH );
        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
        UpnpCloseSocket( ssdpSock );
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
@@ -1019,8 +968,8 @@ get_ssdp_sockets( MiniServerSockArray * out )
    addr.s_addr = inet_addr(LOCAL_HOST);
    if (setsockopt(ssdpSock, IPPROTO_IP, IP_MULTICAST_IF,
                   (char *)&addr, sizeof addr) != 0) {
-        DBGONLY(UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                            "Couldn't set multicast interface.\n" ));
+        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            "Couldn't set multicast interface.\n" );
        /* This is probably not a critical error, so let's continue. */
    }

@@ -1029,11 +978,10 @@ get_ssdp_sockets( MiniServerSockArray * out )
                IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
    if( setsockopt( ssdpSock, SOL_SOCKET, SO_BROADCAST,
                    ( char * )&option, sizeof( option ) ) != 0 ) {
-        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-                             SSDP, __FILE__, __LINE__,
-                             "Error in setting broadcast !!!\n" );
-             )
-            shutdown( ssdpSock, SD_BOTH );
+        UpnpPrintf( UPNP_CRITICAL,
+            SSDP, __FILE__, __LINE__,
+            "Error in setting broadcast !!!\n" );
+        shutdown( ssdpSock, SD_BOTH );
        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
        UpnpCloseSocket( ssdpSock );
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
--- a/upnp/src/urlconfig/urlconfig.c
+++ b/upnp/src/urlconfig/urlconfig.c
@@ -32,6 +32,7 @@
 #include "config.h"
 #include <assert.h>
 #ifndef WIN32
+ #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -62,7 +63,7 @@
 *
 *	Note :
 ************************************************************************/
-static XINLINE void
+static UPNP_INLINE void
 addrToString( IN const struct sockaddr_in *addr,
              OUT char ipaddr_port[] )
 {
@@ -87,7 +88,7 @@ addrToString( IN const struct sockaddr_in *addr,
 *
 *	Note : 'newAlias' should be freed using free()
 ************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 calc_alias( IN const char *alias,
            IN const char *rootPath,
            OUT char **newAlias )
@@ -148,7 +149,7 @@ calc_alias( IN const char *alias,
 *
 *	Note :
 ************************************************************************/
-static XINLINE int
+static UPNP_INLINE int
 calc_descURL( IN const char *ipPortStr,
              IN const char *alias,
              OUT char descURL[LINE_SIZE] )
@@ -168,11 +169,10 @@ calc_descURL( IN const char *ipPortStr,
    strcat( descURL, ipPortStr );
    strcat( descURL, alias );

-    DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                         "desc url: %s\n", descURL );
-         )
+    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+        "desc url: %s\n", descURL );

-        return UPNP_E_SUCCESS;
+    return UPNP_E_SUCCESS;
 }

 /************************************************************************
@@ -408,18 +408,16 @@ configure_urlbase( INOUT IXML_Document * doc,
        goto error_handler;
    }

-    DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                         "desc url: %s\n", docURL );
-         )
-        DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                             "doc = %s\n", xml_str );
-         )
-        // store in web server
-        err_code =
+    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+        "desc url: %s\n", docURL );
+    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+        "doc = %s\n", xml_str );
+    // store in web server
+    err_code =
        web_server_set_alias( new_alias, xml_str, strlen( xml_str ),
                              last_modified );

-  error_handler:
+error_handler:
    free( root_path );
    free( new_alias );