Selaa lähdekoodia

general: Resolve some warnings unique to Windows

Sam Edwards 7 vuotta sitten
vanhempi
sitoutus
bc596797a3

+ 1 - 0
dtool/src/prc/configPageManager.cxx

@@ -13,6 +13,7 @@
 
 #include "configPageManager.h"
 #include "configDeclaration.h"
+#include "configVariableBool.h"
 #include "configVariableString.h"
 #include "configPage.h"
 #include "prcKeyRegistry.h"

+ 0 - 15
panda/src/chan/animChannel.I

@@ -60,21 +60,6 @@ INLINE AnimChannel<SwitchType>::
 ~AnimChannel() {
 }
 
-#if defined(WIN32_VC) || defined(WIN64_VC)
-/**
- * Gets the value of the channel at the indicated frame.  This is a pure
- * virtual function and normally would not need a function body, except that
- * VC++ seems to be unhappy about instantiating the template without it.
- *
- * However, GCC seems to get confused when it *is* defined.  So this whole
- * thing is protected within an ifdef.
- */
-template<class SwitchType>
-void AnimChannel<SwitchType>::
-get_value(int, typename AnimChannel<SwitchType>::ValueType &) {
-}
-#endif
-
 /**
  * Returns the value associated with the current frame, with no scale or share
  * components.  This only makes sense for a matrix-type channel, although for

+ 6 - 0
panda/src/express/checksumHashGenerator.I

@@ -11,6 +11,12 @@
  * @date 2001-05-14
  */
 
+#ifdef _WIN32
+// Needed for PtrToLong, below
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
 /**
  * Adds another integer to the hash so far.  This function should be
  * overridden in base classes; this is the principle implementation of the

+ 0 - 2
panda/src/wgldisplay/wglGraphicsPipe.cxx

@@ -18,8 +18,6 @@
 #include "wglGraphicsBuffer.h"
 #include "wglGraphicsStateGuardian.h"
 
-typedef enum {Software, MCD, ICD} OGLDriverType;
-
 TypeHandle wglGraphicsPipe::_type_handle;
 bool    wglGraphicsPipe::_current_valid;
 HDC     wglGraphicsPipe::_current_hdc;

+ 1 - 1
panda/src/wgldisplay/wglGraphicsWindow.cxx

@@ -357,7 +357,7 @@ setup_colormap(const PIXELFORMATDESCRIPTOR &pixelformat) {
 
 #ifdef NOTIFY_DEBUG
 
-// typedef enum {Software, MCD, ICD} OGLDriverType;
+typedef enum {Software, MCD, ICD} OGLDriverType;
 static const char *OGLDrvStrings[3] = {"Software","MCD","ICD"};
 
 /**

+ 0 - 1
panda/src/windisplay/winGraphicsPipe.cxx

@@ -48,7 +48,6 @@ typedef long (__stdcall *CallNtPowerInformationType) (POWER_INFORMATION_LEVEL in
 
 static int initialize = false;
 static HMODULE psapi_dll = 0;
-static HMODULE power_dll = 0;
 static GetProcessMemoryInfoType GetProcessMemoryInfoFunction = 0;
 static CallNtPowerInformationType CallNtPowerInformationFunction = 0;