There's only a single (test1.c doesn't count) use for LONG_LONG_FORMAT: $ grep LONG_LONG_FORMAT *.[ch] popthelp.c: le += sprintf(le, "%" LONG_LONG_FORMAT, arg.longlongp[0]); system.h:#define LONG_LONG_FORMAT "I64d" system.h:#define LONG_LONG_FORMAT "lld" test1.c: fprintf(stdout, " aLongLong: %" LONG_LONG_FORMAT, aLongLong);
Just inline I64d … if you leave #define LONG_LONG_FORMAT in system.h, someone will surely start to use in the future. 73 de Jeff On Sep 5, 2011, at 8:14 AM, Pinto Elia wrote: > RPM Package Manager, CVS Repository > http://rpm5.org/cvs/ > ____________________________________________________________________________ > > Server: rpm5.org Name: Pinto Elia > Root: /v/rpm/cvs Email: devzero2...@rpm5.org > Module: popt Date: 05-Sep-2011 14:14:31 > Branch: HEAD Handle: 2011090512143000 > > Modified files: > popt CHANGES popthelp.c test1.c > > Log: > redo commit 8396019 > Useless to have format crap just for conforming > to oddball platform > (http://rpm5.org/community/rpm-devel/5166.html). > Keep the patch only inside MinGW. > > Summary: > Revision Changes Path > 1.170 +5 -0 popt/CHANGES > 1.105 +4 -0 popt/popthelp.c > 1.54 +4 -0 popt/test1.c > ____________________________________________________________________________ > > patch -p0 <<'@@ .' > Index: popt/CHANGES > ============================================================================ > $ cvs diff -u -r1.169 -r1.170 CHANGES > --- popt/CHANGES 5 Sep 2011 11:46:28 -0000 1.169 > +++ popt/CHANGES 5 Sep 2011 12:14:30 -0000 1.170 > @@ -1,4 +1,9 @@ > 1.17 -> 2.0: > + - devzero2000: redo commit 8396019 > + Useless to have format crap just for conforming > + to oddball platform > + (http://rpm5.org/community/rpm-devel/5166.html). > + Keep the patch only inside MinGW. > - devzero2000: merge commit fc8836e from git pull request > https://github.com/devzero2000/POPT/pull/2 > "Fix more MSVC build warnings" > @@ . > patch -p0 <<'@@ .' > Index: popt/popthelp.c > ============================================================================ > $ cvs diff -u -r1.104 -r1.105 popthelp.c > --- popt/popthelp.c 5 Sep 2011 11:26:39 -0000 1.104 > +++ popt/popthelp.c 5 Sep 2011 12:14:30 -0000 1.105 > @@ -265,7 +265,11 @@ > le += sprintf(le, "%ld", arg.longp[0]); > break; > case POPT_ARG_LONGLONG: > +#if defined(_MSC_VER) || defined(__MINGW32__) > le += sprintf(le, "%" LONG_LONG_FORMAT, arg.longlongp[0]); > +#else > + le += sprintf(le, "%lld", arg.longlongp[0]); > +#endif > break; > case POPT_ARG_FLOAT: > { double aDouble = (double) arg.floatp[0]; > @@ . > patch -p0 <<'@@ .' > Index: popt/test1.c > ============================================================================ > $ cvs diff -u -r1.53 -r1.54 test1.c > --- popt/test1.c 5 Sep 2011 11:26:39 -0000 1.53 > +++ popt/test1.c 5 Sep 2011 12:14:30 -0000 1.54 > @@ -334,7 +334,11 @@ > if (aLong != bLong) > fprintf(stdout, " aLong: %ld", aLong); > if (aLongLong != bLongLong) > +#if defined(_MSC_VER) || defined(__MINGW32__) > fprintf(stdout, " aLongLong: %" LONG_LONG_FORMAT, aLongLong); > +#else > + fprintf(stdout, " aLongLong: %lld", aLongLong); > +#endif > /*@-realcompare@*/ > if (aFloat != bFloat) > fprintf(stdout, " aFloat: %g", (double)aFloat); > @@ . > ______________________________________________________________________ > RPM Package Manager http://rpm5.org > CVS Sources Repository rpm-...@rpm5.org ______________________________________________________________________ RPM Package Manager http://rpm5.org Developer Communication List rpm-devel@rpm5.org