Patchwork [2/2] ubi-tests/integ: Add PRIxxx_t defines.

login
register
mail settings
Submitter Bill Pringlemeir
Date Nov. 5, 2012, 6:04 p.m.
Message ID <BLU0-SMTP308EDE3F432519B05D37A0B8640@phx.gbl>
Download mbox | patch
Permalink /patch/197266/
State New
Headers show

Comments

Bill Pringlemeir - Nov. 5, 2012, 6:04 p.m.
Message-ID: <87ehk7nc1l.fsf@sympatico.ca>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
--text follows this line--
I doubt this is the 'correct' solution, but it does show the issue.

common.h is shadowed by local copy of the same name.
Also include inttype.h in case the c library does not.

Signed-off-by: Bill Pringlemeir <bpringlemeir@nbsps.com>
---
 tests/ubi-tests/integ.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)
Artem Bityutskiy - Nov. 16, 2012, 8:11 a.m.
On Mon, 2012-11-05 at 13:04 -0500, Bill Pringlemeir wrote:
> Message-ID: <87ehk7nc1l.fsf@sympatico.ca>
> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)
> MIME-Version: 1.0
> Content-Type: text/plain; charset=us-ascii
> --text follows this line--
> I doubt this is the 'correct' solution, but it does show the issue.
> 
> common.h is shadowed by local copy of the same name.
> Also include inttype.h in case the c library does not.
> 
> Signed-off-by: Bill Pringlemeir <bpringlemeir@nbsps.com>

Instead, I just pushed a huge commit which changes ubi-tests so that
they use the top-level common.h. Now everything compiles fine. Thanks!
Bill Pringlemeir - Nov. 25, 2012, 5:33 p.m.
On Mon, 2012-11-05 at 13:04 -0500, Bill Pringlemeir wrote:
>> I doubt this is the 'correct' solution, but it does show the issue.

[snip]

On 16 Nov 2012, dedekind1@gmail.com wrote:
> Instead, I just pushed a huge commit which changes ubi-tests so that
> they use the top-level common.h. Now everything compiles fine. Thanks!

That is what I thought was more appropriate (Ie, 'correct' :).

Regards,
Bill Pringlemeir.

Patch

diff --git a/tests/ubi-tests/integ.c b/tests/ubi-tests/integ.c
index e48f533..9b1347f 100644
--- a/tests/ubi-tests/integ.c
+++ b/tests/ubi-tests/integ.c
@@ -7,6 +7,7 @@ 
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <inttypes.h>
 #include <string.h>
 #include <errno.h>
 
@@ -16,6 +17,17 @@ 
 #include "libubi.h"
 #include "common.h"
 
+/* Duplicate: of common.h in top 'include'. */
+/* Define a print format specifier for off_t */
+#ifdef __USE_FILE_OFFSET64
+#define PRIxoff_t PRIx64
+#define PRIdoff_t PRId64
+#else
+#define PRIxoff_t "l"PRIx32
+#define PRIdoff_t "l"PRId32
+#endif
+
+
 struct erase_block_info;
 struct volume_info;
 struct ubi_device_info;