commit 804147cb7d533f5635da6adc28fbca1467a3078b
author Elliott Hughes <enh@google.com> Wed May 09 20:10:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 09 20:10:14 2012 -0700
tree e8d5ccd983127300a139f1e7ec152cc8ed4ddc04
parent dbd5ecad26e39281bb83f97664bc32555c5c071a
parent edb7cad9b764f029c5faac2750f749d3d84bd86a

am edb7cad9: Merge "Actually set the header guard in "linux-syscalls.h"."

* commit 'edb7cad9b764f029c5faac2750f749d3d84bd86a':
  Actually set the header guard in "linux-syscalls.h".

libc/include/sys/linux-syscalls.h

diff --git a/libc/include/sys/linux-syscalls.h b/libc/include/sys/linux-syscalls.h
index eb04f85..c8a654c 100644
--- a/libc/include/sys/linux-syscalls.h
+++ b/libc/include/sys/linux-syscalls.h
@@ -1,5 +1,6 @@
 /* auto-generated by gensyscalls.py, do not touch */
 #ifndef _BIONIC_LINUX_SYSCALLS_H_
+#define _BIONIC_LINUX_SYSCALLS_H_
 
 #if !defined __ASM_ARM_UNISTD_H && !defined __ASM_I386_UNISTD_H && !defined __ASM_MIPS_UNISTD_H
 #if defined __arm__ && !defined __ARM_EABI__ && !defined __thumb__

libc/tools/gensyscalls.py

diff --git a/libc/tools/gensyscalls.py b/libc/tools/gensyscalls.py
index d5fbecf..9a8a8c7 100755
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@@ -425,7 +425,8 @@
         D( "generating "+path )
         fp = create_file( path )
         fp.write( "/* auto-generated by gensyscalls.py, do not touch */\n" )
-        fp.write( "#ifndef _BIONIC_LINUX_SYSCALLS_H_\n\n" )
+        fp.write( "#ifndef _BIONIC_LINUX_SYSCALLS_H_\n" )
+        fp.write( "#define _BIONIC_LINUX_SYSCALLS_H_\n\n" )
         fp.write( "#if !defined __ASM_ARM_UNISTD_H && !defined __ASM_I386_UNISTD_H && !defined __ASM_MIPS_UNISTD_H\n" )
         fp.write( "#if defined __arm__ && !defined __ARM_EABI__ && !defined __thumb__\n" )
         fp.write( "  #  define __NR_SYSCALL_BASE 0x900000\n" )