Mercurial > hg > CbC > old > device

changeset 928:96c53f76b360

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author kono
date Sun, 13 Apr 2014 10:21:40 +0900
parents b491db049d74 (current diff) 2ec436d10c65 (diff)
children 949ed26efba9
files mc-code-i64.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Apr 13 10:20:02 2014 +0900
+++ b/Makefile	Sun Apr 13 10:21:40 2014 +0900
@@ -1,4 +1,4 @@
-GCC = clang
+GCC = gcc
 CC = $(GCC) -std=c99 $(CCEXT) $(M)  -fgnu89-inline 
 # -O3
 # MCFLAG = -DUSE_CODE_KEYWORD
--- a/mc-code-i64.c	Sun Apr 13 10:20:02 2014 +0900
+++ b/mc-code-i64.c	Sun Apr 13 10:21:40 2014 +0900
@@ -531,7 +531,11 @@
 #define __SIZEOF_LONG_LONG__ 8\n\
 #define __LDBL_DIG__ 18\n\
 #define __GNUC_GNU_INLINE__ 1\n\
+<<<<<<< local
 #define __extension__\n\
+=======
+#define __extension__ \n\
+>>>>>>> other
 "
 #endif 
 // extension is certainly wrong