commit a7678e7e25288765c789fc4a1bfc3dc0665a024f
author H. Peter Anvin <hpa@zytor.com> Fri Jun 09 18:05:16 2006 -0700
committer H. Peter Anvin <hpa@zytor.com> Fri Jun 09 18:05:16 2006 -0700
tree a4d967734a675d4ed74212807284a2aec62893b6
parent 123f39c5a5d811fdff028c0cc3c8ab3aa0908c79
parent 730bb3df2294e6a877777bb52e83b7cc6fb37a38

Merge with klibc.git

usr/klibc/syscalls/Kbuild

diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild
index f5468a3..487ebf7 100644
--- a/usr/klibc/syscalls/Kbuild
+++ b/usr/klibc/syscalls/Kbuild
@@ -38,7 +38,7 @@
 # We pass -ansi to keep cpp from define e.g. "i386" as well as "__i386__"
 quiet_cmd_syscall.i = GEN     $@
       cmd_syscall.i = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \
-                                -ansi -x c++ -E -o $@ $<
+                                -ansi -x c -E -o $@ $<
 $(obj)/SYSCALLS.i: $(KLIBCSRC)/SYSCALLS.def FORCE
 	$(call if_changed_dep,syscall.i)
 

usr/klibc/version

diff --git a/usr/klibc/version b/usr/klibc/version
index 4f9de89..598cea2 100644
--- a/usr/klibc/version
+++ b/usr/klibc/version
@@ -1 +1 @@
-1.3.35
+1.3.36