diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-02-17 01:22:52 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-02-17 01:22:52 -0500 |
| commit | be6bd0b7ab68d0ed968138a41b5d18eb930d7443 (patch) | |
| tree | c79d676f8937f033b92b4a294255f309ce39cdb9 /sysdeps | |
| parent | d55fd7a5573ea7c7c14af95bc37618469cde8a5f (diff) | |
| parent | 8e31c82dbd7dad4d33b35d242b5a990f1168a859 (diff) | |
| download | glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar.gz glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar.bz2 glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/i386/sysdep.h | 5 | ||||
| -rw-r--r-- | sysdeps/mach/i386/thread_state.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sysdeps/mach/i386/sysdep.h b/sysdeps/mach/i386/sysdep.h index 4fc5d50f3d..fb77d4649c 100644 --- a/sysdeps/mach/i386/sysdep.h +++ b/sysdeps/mach/i386/sysdep.h @@ -18,6 +18,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifndef _MACH_I386_SYSDEP_H +#define _MACH_I386_SYSDEP_H 1 + /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */ #include <dl-sysdep.h> #include <tls.h> @@ -64,3 +67,5 @@ #undef ENTRY #undef ALIGN #include <sysdeps/unix/i386/sysdep.h> + +#endif /* mach/i386/sysdep.h */ diff --git a/sysdeps/mach/i386/thread_state.h b/sysdeps/mach/i386/thread_state.h index cefea2cfb6..e8fdef6e57 100644 --- a/sysdeps/mach/i386/thread_state.h +++ b/sysdeps/mach/i386/thread_state.h @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifndef _MACH_I386_THREAD_STATE_H +#define _MACH_I386_THREAD_STATE_H 1 + #include <mach/machine/thread_status.h> #define MACHINE_THREAD_STATE_FLAVOR i386_THREAD_STATE @@ -36,3 +39,5 @@ struct machine_thread_all_state }; #include <sysdeps/mach/thread_state.h> + +#endif /* mach/i386/thread_state.h */ |