diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-09 12:35:13 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-09 12:35:13 +0000 |
commit | f81e8dbc74186f34faa5ae2b0fe8bdc3f18114ae (patch) | |
tree | 91ee95914c2b9a07817bd6f596fc3df758651147 /e2fsprogs | |
parent | 327fd47f362843fc62fbee6169904c416ca13d11 (diff) | |
download | busybox-w32-f81e8dbc74186f34faa5ae2b0fe8bdc3f18114ae.tar.gz busybox-w32-f81e8dbc74186f34faa5ae2b0fe8bdc3f18114ae.tar.bz2 busybox-w32-f81e8dbc74186f34faa5ae2b0fe8bdc3f18114ae.zip |
*: make "pragma GCC visibility push(hidden)" less ugly
Diffstat (limited to 'e2fsprogs')
-rw-r--r-- | e2fsprogs/e2fs_defs.h | 6 | ||||
-rw-r--r-- | e2fsprogs/e2fs_lib.h | 8 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/blkid.h | 7 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/blkidP.h | 7 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/list.h | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/probe.h | 5 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/e2fsbb.h | 6 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h | 7 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/ext2_io.h | 8 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h | 7 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/kernel-jbd.h | 7 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/kernel-list.h | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/uuid/uuid.h | 5 |
13 files changed, 34 insertions, 47 deletions
diff --git a/e2fsprogs/e2fs_defs.h b/e2fsprogs/e2fs_defs.h index b3ea3ae34..379640eb8 100644 --- a/e2fsprogs/e2fs_defs.h +++ b/e2fsprogs/e2fs_defs.h | |||
@@ -10,8 +10,8 @@ | |||
10 | * Copyright (C) 1991, 1992 Linus Torvalds | 10 | * Copyright (C) 1991, 1992 Linus Torvalds |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #ifndef _LINUX_EXT2_FS_H | 13 | #ifndef LINUX_EXT2_FS_H |
14 | #define _LINUX_EXT2_FS_H | 14 | #define LINUX_EXT2_FS_H 1 |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Special inode numbers | 17 | * Special inode numbers |
@@ -558,4 +558,4 @@ struct ext2_dir_entry_2 { | |||
558 | #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ | 558 | #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ |
559 | ~EXT2_DIR_ROUND) | 559 | ~EXT2_DIR_ROUND) |
560 | 560 | ||
561 | #endif /* _LINUX_EXT2_FS_H */ | 561 | #endif |
diff --git a/e2fsprogs/e2fs_lib.h b/e2fsprogs/e2fs_lib.h index e21a0f917..25b26d382 100644 --- a/e2fsprogs/e2fs_lib.h +++ b/e2fsprogs/e2fs_lib.h | |||
@@ -9,9 +9,7 @@ | |||
9 | /* Constants and structures */ | 9 | /* Constants and structures */ |
10 | #include "e2fs_defs.h" | 10 | #include "e2fs_defs.h" |
11 | 11 | ||
12 | #if __GNUC_PREREQ(4,1) | 12 | PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN |
13 | # pragma GCC visibility push(hidden) | ||
14 | #endif | ||
15 | 13 | ||
16 | /* Iterate a function on each entry of a directory */ | 14 | /* Iterate a function on each entry of a directory */ |
17 | int iterate_on_dir(const char *dir_name, | 15 | int iterate_on_dir(const char *dir_name, |
@@ -46,6 +44,4 @@ extern const char e2attr_flags_sname[]; | |||
46 | #define e2attr_flags_sname_chattr (&e2attr_flags_sname[1]) | 44 | #define e2attr_flags_sname_chattr (&e2attr_flags_sname[1]) |
47 | #endif | 45 | #endif |
48 | 46 | ||
49 | #if __GNUC_PREREQ(4,1) | 47 | POP_SAVED_FUNCTION_VISIBILITY |
50 | # pragma GCC visibility pop | ||
51 | #endif | ||
diff --git a/e2fsprogs/old_e2fsprogs/blkid/blkid.h b/e2fsprogs/old_e2fsprogs/blkid/blkid.h index 4fa9f6fdf..9a3c2afdb 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/blkid.h +++ b/e2fsprogs/old_e2fsprogs/blkid/blkid.h | |||
@@ -10,9 +10,8 @@ | |||
10 | * GNU Lesser General Public License. | 10 | * GNU Lesser General Public License. |
11 | * %End-Header% | 11 | * %End-Header% |
12 | */ | 12 | */ |
13 | 13 | #ifndef BLKID_BLKID_H | |
14 | #ifndef _BLKID_BLKID_H | 14 | #define BLKID_BLKID_H 1 |
15 | #define _BLKID_BLKID_H | ||
16 | 15 | ||
17 | #include <sys/types.h> | 16 | #include <sys/types.h> |
18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
@@ -102,4 +101,4 @@ extern int blkid_parse_tag_string(const char *token, char **ret_type, | |||
102 | } | 101 | } |
103 | #endif | 102 | #endif |
104 | 103 | ||
105 | #endif /* _BLKID_BLKID_H */ | 104 | #endif |
diff --git a/e2fsprogs/old_e2fsprogs/blkid/blkidP.h b/e2fsprogs/old_e2fsprogs/blkid/blkidP.h index c7cb8abe9..d6b2b42cc 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/blkidP.h +++ b/e2fsprogs/old_e2fsprogs/blkid/blkidP.h | |||
@@ -10,9 +10,8 @@ | |||
10 | * GNU Lesser General Public License. | 10 | * GNU Lesser General Public License. |
11 | * %End-Header% | 11 | * %End-Header% |
12 | */ | 12 | */ |
13 | 13 | #ifndef BLKID_BLKIDP_H | |
14 | #ifndef _BLKID_BLKIDP_H | 14 | #define BLKID_BLKIDP_H 1 |
15 | #define _BLKID_BLKIDP_H | ||
16 | 15 | ||
17 | #include <sys/types.h> | 16 | #include <sys/types.h> |
18 | #include <stdio.h> | 17 | #include <stdio.h> |
@@ -184,4 +183,4 @@ extern void blkid_free_dev(blkid_dev dev); | |||
184 | } | 183 | } |
185 | #endif | 184 | #endif |
186 | 185 | ||
187 | #endif /* _BLKID_BLKIDP_H */ | 186 | #endif |
diff --git a/e2fsprogs/old_e2fsprogs/blkid/list.h b/e2fsprogs/old_e2fsprogs/blkid/list.h index 8b06d853b..a24baaa91 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/list.h +++ b/e2fsprogs/old_e2fsprogs/blkid/list.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | #if !defined(_BLKID_LIST_H) && !defined(LIST_HEAD) | 2 | #if !defined(_BLKID_LIST_H) && !defined(LIST_HEAD) |
3 | #define _BLKID_LIST_H | 3 | #define BLKID_LIST_H 1 |
4 | 4 | ||
5 | #ifdef __cplusplus | 5 | #ifdef __cplusplus |
6 | extern "C" { | 6 | extern "C" { |
@@ -70,4 +70,4 @@ void list_splice(struct list_head *list, struct list_head *head); | |||
70 | } | 70 | } |
71 | #endif | 71 | #endif |
72 | 72 | ||
73 | #endif /* _BLKID_LIST_H */ | 73 | #endif |
diff --git a/e2fsprogs/old_e2fsprogs/blkid/probe.h b/e2fsprogs/old_e2fsprogs/blkid/probe.h index ef289f505..b6d8f8e7d 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/probe.h +++ b/e2fsprogs/old_e2fsprogs/blkid/probe.h | |||
@@ -11,9 +11,8 @@ | |||
11 | * GNU Lesser General Public License. | 11 | * GNU Lesser General Public License. |
12 | * %End-Header% | 12 | * %End-Header% |
13 | */ | 13 | */ |
14 | 14 | #ifndef BLKID_PROBE_H | |
15 | #ifndef _BLKID_PROBE_H | 15 | #define BLKID_PROBE_H 1 |
16 | #define _BLKID_PROBE_H | ||
17 | 16 | ||
18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
19 | 18 | ||
diff --git a/e2fsprogs/old_e2fsprogs/e2fsbb.h b/e2fsprogs/old_e2fsprogs/e2fsbb.h index 78e7cbd04..d31c31955 100644 --- a/e2fsprogs/old_e2fsprogs/e2fsbb.h +++ b/e2fsprogs/old_e2fsprogs/e2fsbb.h | |||
@@ -6,8 +6,8 @@ | |||
6 | * instead. This makes upgrade between e2fsprogs versions easy. | 6 | * instead. This makes upgrade between e2fsprogs versions easy. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #ifndef __E2FSBB_H__ | 9 | #ifndef E2FSBB_H |
10 | #define __E2FSBB_H__ 1 | 10 | #define E2FSBB_H 1 |
11 | 11 | ||
12 | #include "libbb.h" | 12 | #include "libbb.h" |
13 | 13 | ||
@@ -40,4 +40,4 @@ typedef long errcode_t; | |||
40 | #define WORDS_BIGENDIAN 1 | 40 | #define WORDS_BIGENDIAN 1 |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #endif /* __E2FSBB_H__ */ | 43 | #endif |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h index cb49d7a60..6f4f70862 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h | |||
@@ -13,9 +13,8 @@ | |||
13 | * | 13 | * |
14 | * Copyright (C) 1991, 1992 Linus Torvalds | 14 | * Copyright (C) 1991, 1992 Linus Torvalds |
15 | */ | 15 | */ |
16 | 16 | #ifndef LINUX_EXT2_FS_H | |
17 | #ifndef _LINUX_EXT2_FS_H | 17 | #define LINUX_EXT2_FS_H 1 |
18 | #define _LINUX_EXT2_FS_H | ||
19 | 18 | ||
20 | #include "ext2_types.h" /* Changed from linux/types.h */ | 19 | #include "ext2_types.h" /* Changed from linux/types.h */ |
21 | 20 | ||
@@ -567,4 +566,4 @@ struct ext2_dir_entry_2 { | |||
567 | #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ | 566 | #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ |
568 | ~EXT2_DIR_ROUND) | 567 | ~EXT2_DIR_ROUND) |
569 | 568 | ||
570 | #endif /* _LINUX_EXT2_FS_H */ | 569 | #endif |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_io.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_io.h index e6c9630e2..1900a7639 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_io.h +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_io.h | |||
@@ -9,9 +9,8 @@ | |||
9 | * License. | 9 | * License. |
10 | * %End-Header% | 10 | * %End-Header% |
11 | */ | 11 | */ |
12 | 12 | #ifndef EXT2FS_EXT2_IO_H | |
13 | #ifndef _EXT2FS_EXT2_IO_H | 13 | #define EXT2FS_EXT2_IO_H 1 |
14 | #define _EXT2FS_EXT2_IO_H | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * ext2_loff_t is defined here since unix_io.c needs it. | 16 | * ext2_loff_t is defined here since unix_io.c needs it. |
@@ -110,5 +109,4 @@ extern void (*test_io_cb_write_blk) | |||
110 | extern void (*test_io_cb_set_blksize) | 109 | extern void (*test_io_cb_set_blksize) |
111 | (int blksize, errcode_t err); | 110 | (int blksize, errcode_t err); |
112 | 111 | ||
113 | #endif /* _EXT2FS_EXT2_IO_H */ | 112 | #endif |
114 | |||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h index 133fb1f1b..9f772016f 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h | |||
@@ -9,9 +9,8 @@ | |||
9 | * License. | 9 | * License. |
10 | * %End-Header% | 10 | * %End-Header% |
11 | */ | 11 | */ |
12 | 12 | #ifndef EXT2FS_EXT2FS_H | |
13 | #ifndef _EXT2FS_EXT2FS_H | 13 | #define EXT2FS_EXT2FS_H 1 |
14 | #define _EXT2FS_EXT2FS_H | ||
15 | 14 | ||
16 | 15 | ||
17 | #define EXT2FS_ATTR(x) | 16 | #define EXT2FS_ATTR(x) |
@@ -920,4 +919,4 @@ extern blk_t ext2fs_inode_data_blocks(ext2_filsys fs, | |||
920 | } | 919 | } |
921 | #endif | 920 | #endif |
922 | 921 | ||
923 | #endif /* _EXT2FS_EXT2FS_H */ | 922 | #endif |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/kernel-jbd.h b/e2fsprogs/old_e2fsprogs/ext2fs/kernel-jbd.h index 4c6c7dedd..853d97ac7 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/kernel-jbd.h +++ b/e2fsprogs/old_e2fsprogs/ext2fs/kernel-jbd.h | |||
@@ -13,9 +13,8 @@ | |||
13 | * Definitions for transaction data structures for the buffer cache | 13 | * Definitions for transaction data structures for the buffer cache |
14 | * filesystem journaling support. | 14 | * filesystem journaling support. |
15 | */ | 15 | */ |
16 | 16 | #ifndef LINUX_JBD_H | |
17 | #ifndef _LINUX_JBD_H | 17 | #define LINUX_JBD_H 1 |
18 | #define _LINUX_JBD_H | ||
19 | 18 | ||
20 | #include <sys/types.h> | 19 | #include <sys/types.h> |
21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
@@ -233,4 +232,4 @@ extern void journal_brelse_array(struct buffer_head *b[], int n); | |||
233 | extern void journal_destroy_revoke(journal_t *); | 232 | extern void journal_destroy_revoke(journal_t *); |
234 | 233 | ||
235 | 234 | ||
236 | #endif /* _LINUX_JBD_H */ | 235 | #endif |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/kernel-list.h b/e2fsprogs/old_e2fsprogs/ext2fs/kernel-list.h index 3392596ca..d80716a45 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/kernel-list.h +++ b/e2fsprogs/old_e2fsprogs/ext2fs/kernel-list.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | #ifndef _LINUX_LIST_H | 2 | #ifndef LINUX_LIST_H |
3 | #define _LINUX_LIST_H | 3 | #define LINUX_LIST_H 1 |
4 | 4 | ||
5 | /* | 5 | /* |
6 | * Simple doubly linked list implementation. | 6 | * Simple doubly linked list implementation. |
diff --git a/e2fsprogs/old_e2fsprogs/uuid/uuid.h b/e2fsprogs/old_e2fsprogs/uuid/uuid.h index b30ca3c62..7a9706449 100644 --- a/e2fsprogs/old_e2fsprogs/uuid/uuid.h +++ b/e2fsprogs/old_e2fsprogs/uuid/uuid.h | |||
@@ -32,9 +32,8 @@ | |||
32 | * DAMAGE. | 32 | * DAMAGE. |
33 | * %End-Header% | 33 | * %End-Header% |
34 | */ | 34 | */ |
35 | 35 | #ifndef UUID_UUID_H | |
36 | #ifndef _UUID_UUID_H | 36 | #define UUID_UUID_H 1 |
37 | #define _UUID_UUID_H | ||
38 | 37 | ||
39 | #include <sys/types.h> | 38 | #include <sys/types.h> |
40 | #include <time.h> | 39 | #include <time.h> |