Fix interrogate warnings on Windows. Show warnings when running makepanda in verbose mode.

rdb · rdb · commit ebd1fd846241 · 2015-10-17T03:27:38.000+02:00
diff --git a/dtool/src/parser-inc/NxPhysics.h b/dtool/src/parser-inc/NxPhysics.h
@@ -32,6 +32,7 @@ class NxCapsuleForceFieldShapeDesc;
 class NxCapsuleShape;
 class NxCapsuleShapeDesc;
 class NxCCDSkeleton;
+class NxContactStreamIterator;
 class NxConvexMesh;
 class NxConvexMeshDesc;
 class NxConvexForceFieldShape;
@@ -121,11 +122,16 @@ class NxSoftBodyDesc;
 class NxSoftBodyMesh;
 class NxSoftBodyMeshDesc;
 
-enum NxSDKCreateError;
-enum NxAssertResponse;
-enum NxErrorCode;
-enum NxTriggerFlag;
-enum NxHeightFieldAxis;
+enum NxAssertResponse {
+  NX_AR_CONTINUE,
+  NX_AR_IGNORE,
+  NX_AR_BREAKPOINT
+};
+
+enum NxControllerType {
+  NX_CONTROLLER_CAPSULE,
+  NX_CONTROLLER_FORCE_DWORD = 0x7fffffff
+};
 
 template<class T> class NxUserEntityReport;
 
diff --git a/dtool/src/parser-inc/io.h b/dtool/src/parser-inc/io.h
diff --git a/dtool/src/parser-inc/minmax.h b/dtool/src/parser-inc/minmax.h
diff --git a/dtool/src/parser-inc/ode.h b/dtool/src/parser-inc/ode.h
@@ -19,8 +19,7 @@
 #ifndef _ODE_CONFIG_H_
 #define _ODE_CONFIG_H_
 
-#define dSINGLE 1
-#define ODE_PLATFORM_WINDOWS  
+#define ODE_PLATFORM_WINDOWS
 
 #if !defined(ODE_API)
   #define ODE_API
diff --git a/dtool/src/parser-inc/process.h b/dtool/src/parser-inc/process.h
diff --git a/dtool/src/parser-inc/sys/malloc.h b/dtool/src/parser-inc/sys/malloc.h
diff --git a/dtool/src/parser-inc/sys/timeb.h b/dtool/src/parser-inc/sys/timeb.h
diff --git a/dtool/src/parser-inc/windows.h b/dtool/src/parser-inc/windows.h
@@ -20,23 +20,43 @@
 #ifndef WINDOWS_H
 #define WINDOWS_H
 
+#include <wtypes.h>
+
+#ifdef _WIN64
+typedef int HALF_PTR;
+typedef long long INT_PTR;
+typedef long long LONG_PTR;
+typedef unsigned long long UINT_PTR;
+typedef unsigned long long ULONG_PTR;
+#else
+typedef short HALF_PTR;
+typedef int INT_PTR;
+typedef long LONG_PTR;
+typedef unsigned int UINT_PTR;
+typedef unsigned long ULONG_PTR;
+#endif
+
 // http://msdn.microsoft.com/en-us/library/cc230309.aspx
 typedef bool BOOL;
-typedef long DWORD;
+typedef unsigned long DWORD;
 typedef long LONG;
 typedef long UINT;
 typedef unsigned long ULONG;
-typedef signed long long LONGLONG;
+typedef long long LONGLONG;
 typedef long HRESULT;
 typedef int CRITICAL_SECTION;
-typedef int HANDLE;
-typedef int HGLOBAL;
-typedef int HWAVEIN;
 typedef void *LPSTR;
 typedef void *LPWAVEHDR;
+typedef void *PVOID;
 typedef void *LPVOID;
+typedef PVOID HANDLE;
+typedef HANDLE HGLOBAL;
+typedef HANDLE HWAVEIN;
+typedef HANDLE HWND;
 typedef void *DWORD_PTR;
-typedef unsigned short WCHAR;
+typedef UINT_PTR WPARAM;
+typedef LONG_PTR LPARAM;
+typedef wchar_t WCHAR;
 typedef WCHAR *BSTR;
 typedef struct _MediaType AM_MEDIA_TYPE;
 typedef struct _VIDEO_STREAM_CONFIG_CAPS VIDEO_STREAM_CONFIG_CAPS;
@@ -49,10 +69,6 @@ typedef struct _FILTERKEYS FILTERKEYS;
 
 #define WINAPI
 
-union LARGE_INTEGER {
-  long long QuadPart;
-};
-
 class IGraphBuilder;
 class ICaptureGraphBuilder2;
 class IBaseFilter;
diff --git a/dtool/src/parser-inc/winsock.h b/dtool/src/parser-inc/winsock.h
@@ -0,0 +1,3 @@
+#pragma once
+
+struct timeval;
diff --git a/dtool/src/parser-inc/winsock2.h b/dtool/src/parser-inc/winsock2.h
@@ -2,7 +2,9 @@
 #define _WINSOCK2API_
 #define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
 
-typedef int SOCKET;
+#include <wtypes.h>
+
+typedef unsigned long SOCKET;
 
 struct sockaddr_in;
 
diff --git a/dtool/src/parser-inc/wtypes.h b/dtool/src/parser-inc/wtypes.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#ifndef _WINDEF_
+typedef void *PVOID;
+typedef void *LPVOID;
+typedef float FLOAT;
+typedef struct tagRECT RECT;
+typedef struct tagRECT *PRECT;
+typedef struct tagRECT *LPRECT;
+#endif
+
+typedef unsigned char UCHAR;
+typedef short SHORT;
+typedef unsigned short USHORT;
+typedef unsigned long ULONG;
+typedef double DOUBLE;
+
+typedef unsigned long long DWORDLONG;
+typedef DWORDLONG *PDWORDLONG;
+
+typedef long long LONGLONG;
+typedef unsigned long long ULONGLONG;
+typedef LONGLONG *PLONGLONG;
+typedef ULONGLONG *PULONGLONG;
+
+typedef struct _LARGE_INTEGER LARGE_INTEGER;
+typedef struct _LARGE_INTEGER *PLARGE_INTEGER;
+typedef struct _ULARGE_INTEGER ULARGE_INTEGER;
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
@@ -1351,6 +1351,9 @@ def CompileIgate(woutd,wsrc,opts):
         # Assume that interrogate is on the PATH somewhere.
         cmd = 'interrogate'
 
+    if GetVerbose():
+        cmd += ' -v'
+
     cmd += ' -srcdir %s -I%s' % (srcdir, srcdir)
     cmd += ' -DCPPPARSER -D__STDC__=1 -D__cplusplus=201103L'
     if (COMPILER=="MSVC"):
diff --git a/panda/src/net/connectionManager.cxx b/panda/src/net/connectionManager.cxx
@@ -23,12 +23,13 @@
 #include "lightMutexHolder.h"
 #include "trueClock.h"
 
-#if defined(WIN32_VC) || defined(WIN64_VC)
+#if defined(CPPPARSER)
+#elif defined(WIN32_VC) || defined(WIN64_VC)
 #include <winsock2.h>  // For gethostname()
 #include <Iphlpapi.h> // For GetAdaptersAddresses()
 #elif defined(ANDROID)
 #include <net/if.h>
-#elif !defined(CPPPARSER)
+#else
 #include <net/if.h>
 #include <ifaddrs.h>
 #endif
diff --git a/panda/src/pipeline/threadDummyImpl.cxx b/panda/src/pipeline/threadDummyImpl.cxx
@@ -19,8 +19,10 @@
 #include "threadDummyImpl.h"
 #include "thread.h"
 
-#ifdef WIN32
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 #endif
 
diff --git a/panda/src/putil/pbitops.h b/panda/src/putil/pbitops.h
@@ -18,7 +18,7 @@
 #include "pandabase.h"
 #include "numeric_types.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(CPPPARSER)
 #include <intrin.h>
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#pragma once`
	`2`	`+`
	`3`	`+struct timeval;`