Merge changes from 1.1 tree.

[thirdparty/cups.git] / pdftops / Object.cxx

diff --git a/pdftops/Object.cxx b/pdftops/Object.cxx
index f9c10674d8957aede9507c7aaefeace4afd71c98..b3ebe40f0e6cefd2326f723e6b5d1653d17315b0 100644 (file)
--- a/pdftops/Object.cxx
+++ b/pdftops/Object.cxx
@@ -22,7 +22,7 @@
 // Object
 //------------------------------------------------------------------------
 
-char *objTypeNames[numObjTypes] = {
+const char *objTypeNames[numObjTypes] = {
   "boolean",
   "integer",
   "real",
@@ -103,7 +103,7 @@ void Object::free() {
     delete string;
     break;
   case objName:
-    gfree(name);
+    gfree((void *)name);
     break;
   case objArray:
     if (!array->decRef()) {
@@ -121,7 +121,7 @@ void Object::free() {
     }
     break;
   case objCmd:
-    gfree(cmd);
+    gfree((void *)cmd);
     break;
   default:
     break;
@@ -132,7 +132,7 @@ void Object::free() {
   type = objNone;
 }
 
-char *Object::getTypeName() {
+const char *Object::getTypeName() {
   return objTypeNames[type];
 }
 
@@ -216,5 +216,7 @@ void Object::memCheck(FILE *f) {
        fprintf(f, "  %-20s: %6d\n", objTypeNames[i], numAlloc[i]);
     }
   }
+#else
+  (void)f;
 #endif
 }