diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-05-29 14:34:53 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-05-29 14:41:32 +0200 |
commit | c040ce6dd05b48b971d8dcc8fc8f23957ed15f9c (patch) | |
tree | 68128a8b1e355ef36a6abc462d06b2a744845dfd /src/gl/string.in.h | |
parent | 33f82322503a9eba8f2d848d2a21398207db4832 (diff) | |
download | gnutls-c040ce6dd05b48b971d8dcc8fc8f23957ed15f9c.tar.gz |
updated gnulib
Diffstat (limited to 'src/gl/string.in.h')
-rw-r--r-- | src/gl/string.in.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/gl/string.in.h b/src/gl/string.in.h index ebd727eda1..2abd6bc0e1 100644 --- a/src/gl/string.in.h +++ b/src/gl/string.in.h @@ -15,16 +15,32 @@ You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _@GUARD_PREFIX@_STRING_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#if defined _GL_ALREADY_INCLUDING_STRING_H +/* Special invocation convention: + - On OS X/NetBSD we have a sequence of nested includes + <string.h> -> <strings.h> -> "string.h" + In this situation system _chk variants due to -D_FORTIFY_SOURCE + might be used after any replacements defined here. */ + +#@INCLUDE_NEXT@ @NEXT_STRING_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_STRING_H + +#define _GL_ALREADY_INCLUDING_STRING_H + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRING_H@ +#undef _GL_ALREADY_INCLUDING_STRING_H + #ifndef _@GUARD_PREFIX@_STRING_H #define _@GUARD_PREFIX@_STRING_H @@ -1027,3 +1043,4 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp is unportable - " #endif /* _@GUARD_PREFIX@_STRING_H */ #endif /* _@GUARD_PREFIX@_STRING_H */ +#endif |