emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default to using C99 standard.

Browse Source
This commit is contained in:
Roy Marples 2008-02-19 16:49:28 +00:00
parent 916a4463ce
commit 42dd9965cc
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mk/cc.mk
View File

@ -4,6 +4,11 @@
CFLAGS?= -O2 -pipe CFLAGS?= -O2 -pipe
CSTD?= c99
_CSTD_SH= if test -n "${CSTD}"; then echo "-std=${CSTD}"; else echo ""; fi
_CSTD!= ${_CSTD_SH}
CFLAGS+= ${_CSTD}$(shell _CSTD_SH)
# GNU Make way of detecting gcc flags we can use # GNU Make way of detecting gcc flags we can use
check_gcc=$(shell if ${CC} $(1) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \ check_gcc=$(shell if ${CC} $(1) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
then echo "$(1)"; else echo "$(2)"; fi) then echo "$(1)"; else echo "$(2)"; fi)
@ -23,4 +28,3 @@ CFLAGS+= -pedantic \
$(call check_gcc, -Wdeclaration-after-statement) \ $(call check_gcc, -Wdeclaration-after-statement) \
$(call check_gcc, -Wsequence-point) \ $(call check_gcc, -Wsequence-point) \
$(call check_gcc, -Wextra) ${WEXTRA} $(call check_gcc, -Wextra) ${WEXTRA}

11
src/librc/librc-depend.c
View File

@ -995,17 +995,18 @@ next:
i = 0; i = 0;
for (depinfo = deptree; depinfo; depinfo = depinfo->next) for (depinfo = deptree; depinfo; depinfo = depinfo->next)
{ {
fprintf (fp, "depinfo_%lu_service='%s'\n", fprintf (fp, "depinfo_%zu_service='%s'\n",
(unsigned long) i, depinfo->service); i, depinfo->service);
for (deptype = depinfo->depends; deptype; deptype = deptype->next) for (deptype = depinfo->depends; deptype; deptype = deptype->next)
{ {
k = 0; k = 0;
STRLIST_FOREACH (deptype->services, service, j) STRLIST_FOREACH (deptype->services, service, j)
{ {
fprintf (fp, "depinfo_%lu_%s_%lu='%s'\n", fprintf (fp,
(unsigned long) i, "depinfo_%zu_%s_%zu='%s'\n",
i,
deptype->type, deptype->type,
(unsigned long) k, service); k, service);
k++; k++;
} }
} }