Merge of trunk into branch 1.6.x.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@339 119443c7-1b9e-41f8-b6fc-b9c35fce742c

upnp/src/genlib/net/http/webserver.c

@@ -38,11 +38,9 @@
 #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"
@@ -536,9 +534,9 @@ web_server_init( void )
     int ret_code;
 
     if( bWebServerState == WEB_SERVER_DISABLED ) {
-        media_list_init(  );    // decode media list
+        media_list_init();    // decode media list
         membuffer_init( &gDocumentRootDir );
-        glob_alias_init(  );
+        glob_alias_init();
 
         pVirtualDirList = NULL;