Merge branch 'dfsg-orig' into dfsg-debian

[debian/tar] / gnu / obstack.h

diff --git a/gnu/obstack.h b/gnu/obstack.h
index 113aad817e432f049805074f9298518a33984bf2..19d4429aa08406777e9a61a0b89b16bc08e118b7 100644 (file)
--- a/gnu/obstack.h
+++ b/gnu/obstack.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro: */
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* obstack.h - object stack macros
-   Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2010 Free Software
+   Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2011 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -105,10 +105,6 @@ Summary:
 
 #ifndef _OBSTACK_H
 #define _OBSTACK_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 \f
 /* We need the type of a pointer subtraction.  If __PTRDIFF_TYPE__ is
    defined, as with GNU C, use that; that way we don't pollute the
@@ -141,6 +137,10 @@ extern "C" {
 
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct _obstack_chunk           /* Lives at front of each chunk. */
 {
   char  *limit;                 /* 1 past end of this chunk */