Re: SunOS build failures for the last 2 days

[Wayne Davison <wayned@users.sourceforge.net>]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

On Wed, Aug 17, 2005 at 02:52:54PM -0400, Vin Shelton wrote:
> This prints 'No'.

OK.  I also note that the ZLE_UNICODE_SUPPORT define is not defined in
your config.h, which is as it should be for a "No" case.  So, I just
forced multibyte off for my system and I note that those prototypes
are still in the utils.epro file.  Ahh, the #ifdef lines are not
properly marked as needing to be copied into the utils.epro file.
Attached is a patch that I'm about to check in.

..wayne..

[-- Attachment #2: ifdef.patch --]
[-- Type: text/plain, Size: 1531 bytes --]

--- Src/string.c	15 Aug 2005 17:20:29 -0000	1.6
+++ Src/string.c	17 Aug 2005 19:11:55 -0000
@@ -54,6 +54,7 @@ ztrdup(const char *s)
     return t;
 }
 
+/**/
 #ifdef ZLE_UNICODE_SUPPORT
 /**/
 mod_export wchar_t *
@@ -67,6 +68,7 @@ wcs_ztrdup(const wchar_t *s)
     wcscpy(t, s);
     return t;
 }
+/**/
 #endif /* ZLE_UNICODE_SUPPORT */
 
 
--- Src/utils.c	15 Aug 2005 17:20:29 -0000	1.87
+++ Src/utils.c	17 Aug 2005 19:11:55 -0000
@@ -243,6 +243,7 @@ nicechar(int c)
     return buf;
 }
 
+/**/
 #ifdef ZLE_UNICODE_SUPPORT
 /**/
 mod_export wchar_t *
@@ -280,6 +281,7 @@ wcs_nicechar(wint_t c)
     *s = 0;
     return buf;
 }
+/**/
 #endif /* ZLE_UNICODE_SUPPORT */
 
 
@@ -2493,6 +2495,7 @@ zarrdup(char **s)
     return y;
 }
 
+/**/
 #ifdef ZLE_UNICODE_SUPPORT
 /**/
 mod_export wchar_t **
@@ -2506,6 +2509,7 @@ wcs_zarrdup(wchar_t **s)
 
     return y;
 }
+/**/
 #endif /* ZLE_UNICODE_SUPPORT */
 
 /**/
@@ -3106,6 +3110,7 @@ zputs(char const *s, FILE *stream)
     return 0;
 }
 
+/**/
 #ifdef ZLE_UNICODE_SUPPORT
 /**/
 mod_export int
@@ -3127,6 +3132,7 @@ wcs_zputs(wchar_t const *s, FILE *stream
     }
     return 0;
 }
+/**/
 #endif /* ZLE_UNICODE_SUPPORT */
 
 /* Create a visibly-represented duplicate of a string. */
@@ -3215,6 +3221,7 @@ niceztrlen(char const *s)
     return l;
 }
 
+/**/
 #ifdef ZLE_UNICODE_SUPPORT
 /**/
 mod_export size_t
@@ -3236,6 +3243,7 @@ wcs_nicewidth(wchar_t const *s)
     }
     return l;
 }
+/**/
 #endif /* ZLE_UNICODE_SUPPORT */
 
 /* check for special characters in the string */