From 76524dcafa4c969cd3a828680eafbb21a8a08de2 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 2 Oct 2001 22:34:29 +0000
Subject: [PATCH] windows fix

---
 dtool/src/interrogate/functionWriters.h           | 2 +-
 dtool/src/interrogate/wrapperBuilderPythonObj.cxx | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dtool/src/interrogate/functionWriters.h b/dtool/src/interrogate/functionWriters.h
index 7e5e19c46d..87681fe237 100644
--- a/dtool/src/interrogate/functionWriters.h
+++ b/dtool/src/interrogate/functionWriters.h
@@ -22,7 +22,7 @@
 #include "dtoolbase.h"
 #include "functionWriter.h"
 
-#include <set.h>
+#include <set>
 
 ////////////////////////////////////////////////////////////////////
 //       Class : FunctionWriters
diff --git a/dtool/src/interrogate/wrapperBuilderPythonObj.cxx b/dtool/src/interrogate/wrapperBuilderPythonObj.cxx
index 5b39c23603..2e5c740444 100644
--- a/dtool/src/interrogate/wrapperBuilderPythonObj.cxx
+++ b/dtool/src/interrogate/wrapperBuilderPythonObj.cxx
@@ -127,7 +127,8 @@ write_wrapper(ostream &out, const string &wrapper_name) const {
   out << "/*\n"
       << " * Python object wrapper for\n";
 
-  for (int def_index = 0; def_index < (int)_def.size(); ++def_index) {
+  int def_index;
+  for (def_index = 0; def_index < (int)_def.size(); ++def_index) {
     const FunctionDef *def = _def[def_index];
     out << " * " << def->_description << "\n";
     if (def->_is_method) {
@@ -153,7 +154,7 @@ write_wrapper(ostream &out, const string &wrapper_name) const {
   write_spam_message(0, out);
   string expected_params = "Arguments must match one of:";
 
-  for (int def_index = 0; def_index < (int)_def.size(); ++def_index) {
+  for (def_index = 0; def_index < (int)_def.size(); ++def_index) {
     const FunctionDef *def = _def[def_index];
     out << "  {\n"
         << "    /* " << def->_description << " */\n"