From 0db7f616ad86e3d77aa79ebdeb9a5ddfeefc18ef Mon Sep 17 00:00:00 2001
From: Urs Janssen <urs@hq.tin.org>
Date: Mon, 18 Feb 2013 15:44:18 +0100
Subject: [PATCH] remove doubled prototype fix documentation about __TINYC__
 define __STDC_HOSTED__ like __STDC__

---
 TODO         | 1 -
 libtcc.c     | 5 +++--
 tcc-doc.texi | 3 +--
 tccpp.c      | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 74fe8a66..ea578236 100644
--- a/TODO
+++ b/TODO
@@ -9,7 +9,6 @@ Bugs:
 - constructors
 - cast bug (Peter Wang)
 - define incomplete type if defined several times (Peter Wang).
-- configure --cc=tcc (still one bug in libtcc1.c)
 - test binutils/gcc compile
 - tci patch + argument.
 - see -lxxx bug (Michael Charity).
diff --git a/libtcc.c b/libtcc.c
index 1fdee49f..7fc9827d 100644
--- a/libtcc.c
+++ b/libtcc.c
@@ -571,7 +571,8 @@ static void error1(TCCState *s1, int is_warning, const char *fmt, va_list ap)
     
     buf[0] = '\0';
     /* use upper file if inline ":asm:" or token ":paste:" */
-    for (f = file; f && f->filename[0] == ':'; f = f->prev);
+    for (f = file; f && f->filename[0] == ':'; f = f->prev)
+     ;
     if (f) {
         for(pf = s1->include_stack; pf < s1->include_stack_ptr; pf++)
             strcat_printf(buf, sizeof(buf), "In file included from %s:%d:\n",
@@ -924,7 +925,7 @@ LIBTCCAPI TCCState *tcc_new(void)
     /* standard defines */
     tcc_define_symbol(s, "__STDC__", NULL);
     tcc_define_symbol(s, "__STDC_VERSION__", "199901L");
-    tcc_define_symbol(s, "__STDC_HOSTED__", "1");
+    tcc_define_symbol(s, "__STDC_HOSTED__", NULL);
 
     /* target defines */
 #if defined(TCC_TARGET_I386)
diff --git a/tcc-doc.texi b/tcc-doc.texi
index f5e6d6d0..96e7a28e 100644
--- a/tcc-doc.texi
+++ b/tcc-doc.texi
@@ -597,8 +597,7 @@ are supported.
 
 @itemize
 
-@item @code{__TINYC__} is a predefined macro to @code{1} to
-indicate that you use TCC.
+@item @code{__TINYC__} is a predefined macro to indicate that you use TCC.
 
 @item @code{#!} at the start of a line is ignored to allow scripting.
 
diff --git a/tccpp.c b/tccpp.c
index 2d6e8523..aeaf6be6 100644
--- a/tccpp.c
+++ b/tccpp.c
@@ -78,7 +78,6 @@ struct macro_level {
     const int *p;
 };
 
-ST_FUNC void next_nomacro(void);
 static void next_nomacro_spc(void);
 static void macro_subst(
     TokenString *tok_str,
-- 
2.11.4.GIT