From ab936aeb8cf14891d2f86aa170bc336a8d886677 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Wed, 18 Apr 2012 18:43:09 +0200
Subject: [PATCH] cleanup some partially broken patches

- tests/Makefile:
  fix commit de54586d5b45800e26952ec77b4f51ad4c1e0079
  This hunk it unrelated to the other changes (which are about MacOSX).
  It is not useful and partially wrong.  Optional tests are meant to
  stay optional, btest would work only for i386

- tcc.h:
  fix commit c52d79605a3c895a16e18f0b7193f1f4b480a60f by unknown
  The message says it's for MINTW but the patch has obviously
  no effect for MINGW (which defines __GNUC__).  However the patch
  seems useful for MSC which however needs _strto(u)i64 with underscore.

- Makefile:
  fix commit 5280293d6b16bbe24dfda76e37f32322fa2874ca
  Do not build tcc.o with -DONE_SOURCE because we finally build tcc
  from tcc.o and libtcc.a/so
---
 Makefile       | 2 +-
 tcc.h          | 4 ++--
 tests/Makefile | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 97efbbaf..ec95c53a 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,7 @@ LIBTCC_INC = $(filter %.h,$(CORE_FILES)) $(filter-out $(CORE_FILES),$(NATIVE_FIL
 else
 LIBTCC_OBJ = libtcc.o
 LIBTCC_INC = $(NATIVE_FILES)
-$(LIBTCC_OBJ) tcc.o : NATIVE_DEFINES += -DONE_SOURCE
+libtcc.o : NATIVE_DEFINES += -DONE_SOURCE
 endif
 
 $(LIBTCC_OBJ) tcc.o : %.o : %.c $(LIBTCC_INC)
diff --git a/tcc.h b/tcc.h
index 00fc4bb2..3cd68443 100644
--- a/tcc.h
+++ b/tcc.h
@@ -882,8 +882,8 @@ enum tcc_token {
 #ifndef __GNUC__
   #define strtold (long double)strtod
   #define strtof (float)strtod
-  #define strtoll (long long)strtol
-  #define strtoull (unsigned long long)strtoui64
+  #define strtoll _strtoi64
+  #define strtoull _strtoui64
 #endif
 #else
 /* XXX: need to define this to use them in non ISOC99 context */
diff --git a/tests/Makefile b/tests/Makefile
index 4ce9dfaa..e07cdc35 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,10 +3,10 @@
 #
 
 # what tests to run
-TESTS = libtest test1 test3
+TESTS = libtest test3
 
 # these should work too
-TESTS += test2 speedtest btest weaktest
+# TESTS += test1 test2 speedtest btest weaktest
 
 # these don't work as they should
 # TESTS += test4 asmtest
-- 
2.11.4.GIT