# HG changeset patch # User Bruno Haible # Date 1162413039 0 # Node ID 49c1c5e086f49210d09f50a2e7d8b5feee485900 # Parent d96b2147d668fc18a83dff3f29f7646f5dc592c3 Make it compile in C++ mode. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-11-01 Bruno Haible + + * lib/printf-parse.c (PRINTF_PARSE): Cast malloc/realloc results. + 2006-11-01 Eric Blake * lib/mkstemp-safer.c (mkstemp_safer): Allow C++ compilation. diff --git a/lib/printf-parse.c b/lib/printf-parse.c --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -68,7 +68,7 @@ d->count = 0; d_allocated = 1; - d->dir = malloc (d_allocated * sizeof (DIRECTIVE)); + d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE)); if (d->dir == NULL) /* Out of memory. */ return -1; @@ -92,9 +92,9 @@ if (size_overflow_p (memory_size)) \ /* Overflow, would lead to out of memory. */ \ goto error; \ - memory = (a->arg \ - ? realloc (a->arg, memory_size) \ - : malloc (memory_size)); \ + memory = (argument *) (a->arg \ + ? realloc (a->arg, memory_size) \ + : malloc (memory_size)); \ if (memory == NULL) \ /* Out of memory. */ \ goto error; \ @@ -515,7 +515,7 @@ if (size_overflow_p (memory_size)) /* Overflow, would lead to out of memory. */ goto error; - memory = realloc (d->dir, memory_size); + memory = (DIRECTIVE *) realloc (d->dir, memory_size); if (memory == NULL) /* Out of memory. */ goto error;