From: Wayne Davison <wayned@samba.org>
Date: Thu, 9 Nov 2006 02:55:32 +0000 (+0000)
Subject: Disable POPT_WCHAR_HACK for now.
X-Git-Tag: v3.0.0pre1~605
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=564782ba95755052db12357fe59f81877b0adfa1;p=thirdparty%2Frsync.git

Disable POPT_WCHAR_HACK for now.
---

diff --git a/popt/popthelp.c b/popt/popthelp.c
index 70560540..ba8d0243 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -10,7 +10,7 @@
 
 #include "system.h"
 
-#define	POPT_WCHAR_HACK
+/*#define POPT_WCHAR_HACK*/
 #ifdef 	POPT_WCHAR_HACK
 #include <wchar.h>			/* for mbsrtowcs */
 /*@access mbstate_t @*/
@@ -360,7 +360,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 /*@=boundswrite@*/
 
     if (help)
-	fprintf(fp,"  %-*s   ", maxLeftCol+displaypad, left);
+	fprintf(fp,"  %-*s   ", (int)maxLeftCol+displaypad, left);
     else {
 	fprintf(fp,"  %s\n", left); 
 	goto out;