Changeset 25027 for branches/pap/psLib/test/sys/tap_psString.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psLib/test/sys/tap_psString.c (modified) (2 diffs)

branches/pap/psLib/test/sys/tap_psString.c

@@ -420 +420 @@
 
         //psStringAppend should return 0 for NULL input format
-        outSize = psStringAppend(test, nullTest);
+        // note that only a string literal is allowed for the NULL due to gcc change
+        outSize = psStringAppend(test, NULL);
         ok(outSize == 0, "psStringAppend to return 0 for NULL input format");
 
@@ -428 +429 @@
 
         //psStringPrepend should return 0 for NULL input format
-        outSize = psStringPrepend(test, nullTest);
+        // note that only a string literal is allowed for the NULL due to gcc change
+        outSize = psStringPrepend(test, NULL);
         ok(outSize == 0, "psStringPrepend to return 0 for NULL input format");