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 15:20:54
Branch: HEAD Handle: 2011090513205400
Modified files:
popt popthelp.c system.h test1.c
Log:
redo commit 8396019 again
get rid of LONG_LONG format specifier and inline
it instead
Summary:
Revision Changes Path
1.106 +1 -1 popt/popthelp.c
1.26 +0 -5 popt/system.h
1.55 +1 -1 popt/test1.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/popthelp.c
============================================================================
$ cvs diff -u -r1.105 -r1.106 popthelp.c
--- popt/popthelp.c 5 Sep 2011 12:14:30 -0000 1.105
+++ popt/popthelp.c 5 Sep 2011 13:20:54 -0000 1.106
@@ -266,7 +266,7 @@
break;
case POPT_ARG_LONGLONG:
#if defined(_MSC_VER) || defined(__MINGW32__)
- le += sprintf(le, "%" LONG_LONG_FORMAT, arg.longlongp[0]);
+ le += sprintf(le, "%I64d", arg.longlongp[0]);
#else
le += sprintf(le, "%lld", arg.longlongp[0]);
#endif
@@ .
patch -p0 <<'@@ .'
Index: popt/system.h
============================================================================
$ cvs diff -u -r1.25 -r1.26 system.h
--- popt/system.h 5 Sep 2011 11:46:28 -0000 1.25
+++ popt/system.h 5 Sep 2011 13:20:54 -0000 1.26
@@ -88,10 +88,6 @@
#define S_ISGID 00020000
#define S_ISVTX 00010000
-/* I haven't discovered a better way to work around these format
- specifier problems */
-#define LONG_LONG_FORMAT "I64d"
-
/* CHECKME */
#define S_IWGRP 00000020
@@ -147,7 +143,6 @@
#else
-#define LONG_LONG_FORMAT "lld"
#endif /* defined(_MSC_VER) || defined(__MINGW32__) */
@@ .
patch -p0 <<'@@ .'
Index: popt/test1.c
============================================================================
$ cvs diff -u -r1.54 -r1.55 test1.c
--- popt/test1.c 5 Sep 2011 12:14:30 -0000 1.54
+++ popt/test1.c 5 Sep 2011 13:20:54 -0000 1.55
@@ -335,7 +335,7 @@
fprintf(stdout, " aLong: %ld", aLong);
if (aLongLong != bLongLong)
#if defined(_MSC_VER) || defined(__MINGW32__)
- fprintf(stdout, " aLongLong: %" LONG_LONG_FORMAT, aLongLong);
+ fprintf(stdout, " aLongLong: %I64d", aLongLong);
#else
fprintf(stdout, " aLongLong: %lld", aLongLong);
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
