diff --git a/pandatool/src/maya/mayaFile.cxx b/pandatool/src/maya/mayaFile.cxx
index 4c6c1e02cf..78754ea83d 100644
--- a/pandatool/src/maya/mayaFile.cxx
+++ b/pandatool/src/maya/mayaFile.cxx
@@ -749,7 +749,7 @@ get_egg_group(const string &name, EggData &data) {
   } else {
     size_t bar = name.rfind("|");
     string parent_name, local_name;
-    if (bar != NPOS) {
+    if (bar != string::npos) {
       parent_name = name.substr(0, bar);
       local_name = name.substr(bar + 1);
     } else {
diff --git a/pandatool/src/progbase/wordWrapStreamBuf.cxx b/pandatool/src/progbase/wordWrapStreamBuf.cxx
index d917c73ab4..88369dfd60 100644
--- a/pandatool/src/progbase/wordWrapStreamBuf.cxx
+++ b/pandatool/src/progbase/wordWrapStreamBuf.cxx
@@ -9,8 +9,8 @@
 
 #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;
 #endif