projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dfsg-orig' into dfsg-debian
[debian/tar]
/
lib
/
wordsplit.h
diff --git
a/lib/wordsplit.h
b/lib/wordsplit.h
index d64cf2f7719bc91b20f25795c04295cb74a4a260..e0d2559d049569de1f7de63c7bcfcb01dea56c0e 100644
(file)
--- a/
lib/wordsplit.h
+++ b/
lib/wordsplit.h
@@
-1,5
+1,5
@@
/* wordsplit - a word splitter
/* wordsplit - a word splitter
- Copyright (C) 2009-2014 Free Software Foundation, Inc.
+ Copyright (C) 2009-2014
, 2016
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@
-22,6
+22,12
@@
#include <stddef.h>
#include <stddef.h>
+#if 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+# define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+#else
+# define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) /* empty */
+#endif
+
struct wordsplit
{
size_t ws_wordc;
struct wordsplit
{
size_t ws_wordc;
@@
-34,9
+40,9
@@
struct wordsplit
const char *ws_escape;
void (*ws_alloc_die) (struct wordsplit * wsp);
void (*ws_error) (const char *, ...)
const char *ws_escape;
void (*ws_alloc_die) (struct wordsplit * wsp);
void (*ws_error) (const char *, ...)
-
__attribute__ ((__format__ (__printf__, 1, 2)
));
+
__WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2
));
void (*ws_debug) (const char *, ...)
void (*ws_debug) (const char *, ...)
-
__attribute__ ((__format__ (__printf__, 1, 2)
));
+
__WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2
));
const char **ws_env;
const char *(*ws_getvar) (const char *, size_t, void *);
const char **ws_env;
const char *(*ws_getvar) (const char *, size_t, void *);