- Unbreak on 10.x (clang only environment).

This commit is contained in:
Jun Kuriyama 2013-12-31 14:30:38 +00:00
parent 30b9bb664f
commit 1dfc8beba3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=338312
2 changed files with 40 additions and 0 deletions

View file

@ -0,0 +1,29 @@
--- cs/util/neo_err.h.orig 2013-12-31 23:09:45.821123833 +0900
+++ cs/util/neo_err.h 2013-12-31 23:16:18.810123255 +0900
@@ -85,7 +85,7 @@
*/
#if defined(USE_C99_VARARG_MACROS)
#define nerr_raise(e,f,...) \
- nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__)
+ nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__)
#elif defined(USE_GNUC_VARARG_MACROS)
#define nerr_raise(e,f,a...) \
nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a)
@@ -99,7 +99,7 @@
#if defined(USE_C99_VARARG_MACROS)
#define nerr_raise_errno(e,f,...) \
- nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__)
+ nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__)
#elif defined(USE_GNUC_VARARG_MACROS)
#define nerr_raise_errno(e,f,a...) \
nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a)
@@ -139,7 +139,7 @@
*/
#if defined(USE_C99_VARARG_MACROS)
#define nerr_pass_ctx(e,f,...) \
- nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__)
+ nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__)
#elif defined(USE_GNUC_VARARG_MACROS)
#define nerr_pass_ctx(e,f,a...) \
nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a)

View file

@ -0,0 +1,11 @@
--- cs/rules.mk.in.orig 2013-12-31 22:42:58.734123396 +0900
+++ cs/rules.mk.in 2013-12-31 22:43:10.268123883 +0900
@@ -158,7 +158,7 @@
@touch Makefile.depends
@if test "x" != "x$(SOURCE_FILES)"; then \
for II in "$(SOURCE_FILES)"; do \
- gcc -M -MG ${CFLAGS} $$II >> Makefile.depends; \
+ ${CC} -M -MG ${CFLAGS} $$II >> Makefile.depends; \
done; \
fi
@echo "** (done) "