~vorlon/ubuntu/natty/eglibc/multiarch

« back to all changes in this revision

Viewing changes to debian/patches/hurd-i386/cvs-header-prot.diff

  • Committer: Steve Langasek
  • Date: 2011-02-18 21:18:44 UTC
  • mfrom: (103.1.7 eglibc)
  • Revision ID: steve.langasek@linaro.org-20110218211844-lodmi8b1qhyq3f3x
Tags: 2.13~pre1-0ubuntu1+multiarch.1
merge from natty

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
2011-02-16  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
2
 
 
3
        * sysdeps/mach/i386/sysdep.h: Add _MACH_I386_SYSDEP_H inclusion
 
4
        protection macro.
 
5
        * sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H
 
6
        inclusion protection macro.
 
7
 
 
8
--- a/sysdeps/mach/i386/sysdep.h.original       2011-02-12 02:25:25.000000000 +0000
 
9
+++ b/sysdeps/mach/i386/sysdep.h        2011-02-12 02:25:54.000000000 +0000
 
10
@@ -18,6 +18,9 @@
 
11
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 
12
    02111-1307 USA.  */
 
13
 
 
14
+#ifndef _MACH_I386_SYSDEP_H
 
15
+#define _MACH_I386_SYSDEP_H 1
 
16
+
 
17
 /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO.  */
 
18
 #include <dl-sysdep.h>
 
19
 #include <tls.h>
 
20
@@ -78,3 +81,5 @@
 
21
 #undef ENTRY
 
22
 #undef ALIGN
 
23
 #include <sysdeps/unix/i386/sysdep.h>
 
24
+
 
25
+#endif /* mach/i386/sysdep.h */
 
26
--- a/sysdeps/mach/i386/thread_state.h.original 2011-02-12 02:26:16.000000000 +0000
 
27
+++ b/sysdeps/mach/i386/thread_state.h  2011-02-12 02:26:31.000000000 +0000
 
28
@@ -17,6 +17,9 @@
 
29
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 
30
    02111-1307 USA.  */
 
31
 
 
32
+#ifndef _MACH_I386_THREAD_STATE_H
 
33
+#define _MACH_I386_THREAD_STATE_H 1
 
34
+
 
35
 #include <mach/machine/thread_status.h>
 
36
 
 
37
 #define MACHINE_NEW_THREAD_STATE_FLAVOR        i386_THREAD_STATE
 
38
@@ -45,3 +48,5 @@ struct machine_thread_all_state
 
39
   };
 
40
 
 
41
 #include <sysdeps/mach/thread_state.h>
 
42
+
 
43
+#endif /* mach/i386/thread_state.h */