From d636bc832f6eff1500d5c65818479512a8af25e3 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 26 Nov 2004 19:01:58 +0000
Subject: [PATCH] build on Irix

---
 dtool/Config.pp                     | 7 ++++++-
 dtool/src/prc/configPageManager.cxx | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index f855460903..d3037faa30 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -773,6 +773,11 @@
 // if ranlib is not necessary on your platform.
 #defer RANLIB ranlib $[target]
 
+// Where to put the so_locations file, used by an Irix MIPSPro
+// compiler, to generate a map of shared library memory locations.
+#defer SO_LOCATIONS $[DTOOL_INSTALL]/etc/so_locations
+
+
 // How to generate a shared C or C++ library.  $[source] and $[target]
 // as above, and $[libs] is a space-separated list of dependent
 // libraries, and $[lpath] is a space-separated list of directories in
@@ -833,7 +838,7 @@
   #defer STATIC_LIB_C++ $[CXX] -ar -o $[target] $[sources]
   #defer RANLIB
 
-  #define SHARED_FLAGS -Wl,-none -Wl,-update_registry,$[TOPDIR]/so_locations
+  #defer SHARED_FLAGS -Wl,-none -Wl,-update_registry,$[SO_LOCATIONS]
   #defer SHARED_LIB_C $[cc_ld] -shared $[SHARED_FLAGS] -o $[target] $[sources] $[lpath:%=-L%] $[libs:%=-l%]
   #defer SHARED_LIB_C++ $[cxx_ld] -shared $[SHARED_FLAGS] -o $[target] $[sources] $[lpath:%=-L%] $[libs:%=-l%]
 #endif
diff --git a/dtool/src/prc/configPageManager.cxx b/dtool/src/prc/configPageManager.cxx
index 336b19c637..04adb94d48 100644
--- a/dtool/src/prc/configPageManager.cxx
+++ b/dtool/src/prc/configPageManager.cxx
@@ -205,7 +205,8 @@ reload_implicit_pages() {
         vector_string::reverse_iterator fi;
         for (fi = files.rbegin(); fi != files.rend(); ++fi) {
           int file_flags = 0;
-          for (Globs::const_iterator gi = _prc_patterns.begin();
+          Globs::const_iterator gi;
+          for (gi = _prc_patterns.begin();
                gi != _prc_patterns.end();
                ++gi) {
             if ((*gi).matches(*fi)) {
@@ -213,7 +214,7 @@ reload_implicit_pages() {
               break;
             }
           }
-          for (Globs::const_iterator gi = _prc_executable_patterns.begin();
+          for (gi = _prc_executable_patterns.begin();
                gi != _prc_executable_patterns.end();
                ++gi) {
             if ((*gi).matches(*fi)) {