mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 00:30:06 +02:00
60 lines
1.6 KiB
Plaintext
60 lines
1.6 KiB
Plaintext
From 3c509673672dfacba862e92ade239cbce93ec3d9 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Wed, 10 Sep 2014 16:24:50 +0000
|
|
Subject: gcc2 patch
|
|
|
|
|
|
diff --git a/src/tar.c b/src/tar.c
|
|
index ba24c43..09c344d 100644
|
|
--- a/src/tar.c
|
|
+++ b/src/tar.c
|
|
@@ -548,11 +548,10 @@ static struct argp_option options[] = {
|
|
N_("cancel the effect of --delay-directory-restore option"), GRID+1 },
|
|
{"sort", SORT_OPTION, N_("ORDER"), 0,
|
|
#if D_INO_IN_DIRENT
|
|
- N_("directory sorting order: none (default), name or inode"
|
|
+ N_("directory sorting order: none (default), name or inode"), GRID+1 },
|
|
#else
|
|
- N_("directory sorting order: none (default) or name"
|
|
+ N_("directory sorting order: none (default) or name"), GRID+1 },
|
|
#endif
|
|
- ), GRID+1 },
|
|
#undef GRID
|
|
|
|
#define GRID 55
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From 3269fb640f76f56b450231ae78576c855da9dda1 Mon Sep 17 00:00:00 2001
|
|
From: fbrosson <fbrosson@localhost>
|
|
Date: Sun, 5 Jun 2016 18:48:22 +0000
|
|
Subject: Use __attribute__ only if gcc > 2.95 (instead of gcc >= 2.7)
|
|
|
|
|
|
diff --git a/lib/wordsplit.h b/lib/wordsplit.h
|
|
index e0d2559..c421467 100644
|
|
--- a/lib/wordsplit.h
|
|
+++ b/lib/wordsplit.h
|
|
@@ -40,9 +40,17 @@ struct wordsplit
|
|
const char *ws_escape;
|
|
void (*ws_alloc_die) (struct wordsplit * wsp);
|
|
void (*ws_error) (const char *, ...)
|
|
+#if 2 < __GNUC__ + (95 < __GNUC_MINOR__)
|
|
__WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
|
|
+#else
|
|
+ ;
|
|
+#endif
|
|
void (*ws_debug) (const char *, ...)
|
|
+#if 2 < __GNUC__ + (95 < __GNUC_MINOR__)
|
|
__WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
|
|
+#else
|
|
+ ;
|
|
+#endif
|
|
|
|
const char **ws_env;
|
|
const char *(*ws_getvar) (const char *, size_t, void *);
|
|
--
|
|
2.7.0
|
|
|