Patchwork linux-user: Fix compilation with DEBUG defined

login
register
mail settings
Submitter Riccardo Magliocchetti
Date May 19, 2010, 7:49 p.m.
Message ID <1274298561-8717-1-git-send-email-riccardo.magliocchetti@gmail.com>
Download mbox | patch
Permalink /patch/53013/
State New
Headers show

Comments

Riccardo Magliocchetti - May 19, 2010, 7:49 p.m.
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
---
 linux-user/flatload.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Aurelien Jarno - May 28, 2010, 9:21 p.m.
On Wed, May 19, 2010 at 09:49:21PM +0200, Riccardo Magliocchetti wrote:
> Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>

Thanks, applied.

> ---
>  linux-user/flatload.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/linux-user/flatload.c b/linux-user/flatload.c
> index 6a2c3f9..914de1f 100644
> --- a/linux-user/flatload.c
> +++ b/linux-user/flatload.c
> @@ -338,7 +338,7 @@ failed:
>  static void old_reloc(struct lib_info *libinfo, uint32_t rl)
>  {
>  #ifdef DEBUG
> -	char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" };
> +	const char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" };
>  #endif
>  	uint32_t *ptr;
>          uint32_t offset;
> -- 
> 1.7.1
> 
> 
>

Patch

diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 6a2c3f9..914de1f 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -338,7 +338,7 @@  failed:
 static void old_reloc(struct lib_info *libinfo, uint32_t rl)
 {
 #ifdef DEBUG
-	char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" };
+	const char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" };
 #endif
 	uint32_t *ptr;
         uint32_t offset;