Revert "At least on OpenBSD/amd64, this macro returns a bogus value if its argument...

This reverts commit 0d2f7866ac676ab0f3c8ac3eabcec06f580a9d62.

This causes great mayhem in building/generating dtbuilder .msg files
(corrupting them, and inserting '(nil)' all over the place).

These would cause dtbuilder, and any other program built by dtcodegen
to have screwed up colors, missing callbacks and other mayhem.

This was confirmed by others on the list - reverting this made those
issues go away.

It may be that the int -> long is correct, but the NULL check
certainly does not seem to do what was intended.  I'll leave it up to
Pascal to investigate :)

diff --git a/cde/programs/dtappbuilder/src/libAButil/istr.h b/cde/programs/dtappbuilder/src/libAButil/istr.h
index 358281484f3939b872a7b067046368d9a9ebd5fb..fead77a60689991a66d48958d33e27b9f457d61a 100644 (file)
--- a/cde/programs/dtappbuilder/src/libAButil/istr.h
+++ b/cde/programs/dtappbuilder/src/libAButil/istr.h
@@ -272,7 +272,7 @@ extern ISTR_PRIVT_STRN      *istrP_int_array1809065681PrivD;
 #define istr_string_safe(s) ((s) == NULL? Istr_null_string:istr_string(s))
 
 #define istrP_get_string_fast3718930164PrivF(istring) \
-    ((istring)==NULL ? Istr_null_string : (istrP_int_array1809065681PrivD[((long)istring)].str))
+    (istrP_int_array1809065681PrivD[((int)istring)].str)
 
 /* istr_string - if debugging is turned on, checks ISTRINGS for validity */
 #ifdef DEBUG