Index: src/rpsl/rpsl/prefix.cc
===================================================================
--- src/rpsl/rpsl/prefix.cc	(.../thirdparty/IRRToolSet/current)	(revision 11466)
+++ src/rpsl/rpsl/prefix.cc	(.../network/IRRToolSet)	(revision 11466)
@@ -278,7 +278,10 @@
    default: // ^n-m
       if (_m < n || _m < n)
 	 return false;
-      n = (_n >? n);
+      // XXX - i'm not sure if this is proper, used to be:
+      // n = (_n >? n);
+      // the type promotion was probably implied?
+      n = std::max((unsigned int)_n, get_n());
       m = _m;
    }
 
@@ -705,7 +708,8 @@
    default: // ^n-m
       if (_m < n || _m < n)
          return false;
-      n = (_n >? n);
+      // XXX - see line 281 - PrefixRange::makeMoreSpecific()
+      n = std::max((unsigned int)_n, get_n());
       m = _m;
    }
 
Index: src/Core/util/Buffer.cc
===================================================================
--- src/Core/util/Buffer.cc	(.../thirdparty/IRRToolSet/current)	(revision 11466)
+++ src/Core/util/Buffer.cc	(.../network/IRRToolSet)	(revision 11466)
@@ -174,7 +174,7 @@
 
 void Buffer::extend(unsigned long minExtend) {
    assert(!callerAllocated);	// !!!
-   capacity = (capacity + BufferExtendIncrement) >? (size + minExtend);
+   capacity = std::max((capacity + BufferExtendIncrement), (size + minExtend));
    contents = (char *)realloc(contents, capacity);
 }
 
Index: src/Core/util/strerror.c
===================================================================
--- src/Core/util/strerror.c	(.../thirdparty/IRRToolSet/current)	(revision 11466)
+++ src/Core/util/strerror.c	(.../network/IRRToolSet)	(revision 11466)
@@ -34,6 +34,7 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 
Index: src/re2dfa/re2dfa.c
===================================================================
--- src/re2dfa/re2dfa.c	(.../thirdparty/IRRToolSet/current)	(revision 11466)
+++ src/re2dfa/re2dfa.c	(.../network/IRRToolSet)	(revision 11466)
@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>
+#include <string.h>
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
Index: src/RtConfig/f_cisco.cc
===================================================================
--- src/RtConfig/f_cisco.cc	(.../thirdparty/IRRToolSet/current)	(revision 11466)
+++ src/RtConfig/f_cisco.cc	(.../network/IRRToolSet)	(revision 11466)
@@ -777,7 +777,7 @@
 	 s << out.str();
 	 cerr << "Warning: ip as-path access-list is too long for cisco to handle" << endl;
       } else {
-	 int inc = hasTilda ? 1 : (240 - lineLen + size) >? 5;
+	 int inc = hasTilda ? 1 : std::max((240 - lineLen + size), 5);
 	 p = strdup(out.str().c_str());
 	 q = strchr(r, ')') + 1;
 	 *r = 0;