Import upstream version 1.28

[debian/tar] / gnu / stdint.in.h

diff --git a/gnu/stdint.in.h b/gnu/stdint.in.h
index 6604936b117ca5fa90d64d5c56baa0ee91bed0e3..5d30b76ee67011ef2abbf586f56215b77c2c6ca6 100644 (file)
--- a/gnu/stdint.in.h
+++ b/gnu/stdint.in.h
@@ -1,6 +1,6 @@
 /* -*- buffer-read-only: t -*- vi: set ro: */
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* -*- buffer-read-only: t -*- vi: set ro: */
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */

-/* Copyright (C) 2001-2002, 2004-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.

    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 


@@ -40,8 +40,7 @@
    other system header files; just include the system's <stdint.h>.
    Ideally we should test __BIONIC__ here, but it is only defined after
    <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
    other system header files; just include the system's <stdint.h>.
    Ideally we should test __BIONIC__ here, but it is only defined after
    <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */

-#if defined __ANDROID__ \
-    && defined _SYS_TYPES_H_ && !defined __need_size_t
+#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H

 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #else
 
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #else