Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
73db725bfc
2 changed files with 3 additions and 3 deletions
  1. 1 1
      pandatool/src/maya/mayaFile.cxx
  2. 2 2
      pandatool/src/progbase/wordWrapStreamBuf.cxx

+ 1 - 1
pandatool/src/maya/mayaFile.cxx

@@ -749,7 +749,7 @@ get_egg_group(const string &name, EggData &data) {
   } else {
   } else {
     size_t bar = name.rfind("|");
     size_t bar = name.rfind("|");
     string parent_name, local_name;
     string parent_name, local_name;
-    if (bar != NPOS) {
+    if (bar != string::npos) {
       parent_name = name.substr(0, bar);
       parent_name = name.substr(0, bar);
       local_name = name.substr(bar + 1);
       local_name = name.substr(bar + 1);
     } else {
     } else {

+ 2 - 2
pandatool/src/progbase/wordWrapStreamBuf.cxx

@@ -9,8 +9,8 @@
 
 
 #include <notify.h>
 #include <notify.h>
 
 
-#ifdef PENV_SGI
-// SGI compiler doesn't seem to define this yet.
+#ifndef HAVE_STREAMSIZE
+// Some compilers--notably SGI--don't define this for us.
 typedef int streamsize;
 typedef int streamsize;
 #endif
 #endif