aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-04-09 12:35:13 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-04-09 12:35:13 +0000
commitf81e8dbc74186f34faa5ae2b0fe8bdc3f18114ae (patch)
tree91ee95914c2b9a07817bd6f596fc3df758651147 /e2fsprogs
parent327fd47f362843fc62fbee6169904c416ca13d11 (diff)
downloadbusybox-f81e8dbc74186f34faa5ae2b0fe8bdc3f18114ae.tar.gz
busybox-f81e8dbc74186f34faa5ae2b0fe8bdc3f18114ae.tar.bz2
*: make "pragma GCC visibility push(hidden)" less ugly
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/e2fs_defs.h6
-rw-r--r--e2fsprogs/e2fs_lib.h8
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/blkid.h7
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/blkidP.h7
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/list.h4
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/probe.h5
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsbb.h6
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h7
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext2_io.h8
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h7
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/kernel-jbd.h7
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/kernel-list.h4
-rw-r--r--e2fsprogs/old_e2fsprogs/uuid/uuid.h5
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 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
-#ifndef _LINUX_EXT2_FS_H
-#define _LINUX_EXT2_FS_H
+#ifndef LINUX_EXT2_FS_H
+#define LINUX_EXT2_FS_H 1
/*
* Special inode numbers
@@ -558,4 +558,4 @@ struct ext2_dir_entry_2 {
#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
~EXT2_DIR_ROUND)
-#endif /* _LINUX_EXT2_FS_H */
+#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 @@
/* Constants and structures */
#include "e2fs_defs.h"
-#if __GNUC_PREREQ(4,1)
-# pragma GCC visibility push(hidden)
-#endif
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
/* Iterate a function on each entry of a directory */
int iterate_on_dir(const char *dir_name,
@@ -46,6 +44,4 @@ extern const char e2attr_flags_sname[];
#define e2attr_flags_sname_chattr (&e2attr_flags_sname[1])
#endif
-#if __GNUC_PREREQ(4,1)
-# pragma GCC visibility pop
-#endif
+POP_SAVED_FUNCTION_VISIBILITY
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 @@
* GNU Lesser General Public License.
* %End-Header%
*/
-
-#ifndef _BLKID_BLKID_H
-#define _BLKID_BLKID_H
+#ifndef BLKID_BLKID_H
+#define BLKID_BLKID_H 1
#include <sys/types.h>
#include <linux/types.h>
@@ -102,4 +101,4 @@ extern int blkid_parse_tag_string(const char *token, char **ret_type,
}
#endif
-#endif /* _BLKID_BLKID_H */
+#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 @@
* GNU Lesser General Public License.
* %End-Header%
*/
-
-#ifndef _BLKID_BLKIDP_H
-#define _BLKID_BLKIDP_H
+#ifndef BLKID_BLKIDP_H
+#define BLKID_BLKIDP_H 1
#include <sys/types.h>
#include <stdio.h>
@@ -184,4 +183,4 @@ extern void blkid_free_dev(blkid_dev dev);
}
#endif
-#endif /* _BLKID_BLKIDP_H */
+#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 @@
/* vi: set sw=4 ts=4: */
#if !defined(_BLKID_LIST_H) && !defined(LIST_HEAD)
-#define _BLKID_LIST_H
+#define BLKID_LIST_H 1
#ifdef __cplusplus
extern "C" {
@@ -70,4 +70,4 @@ void list_splice(struct list_head *list, struct list_head *head);
}
#endif
-#endif /* _BLKID_LIST_H */
+#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 @@
* GNU Lesser General Public License.
* %End-Header%
*/
-
-#ifndef _BLKID_PROBE_H
-#define _BLKID_PROBE_H
+#ifndef BLKID_PROBE_H
+#define BLKID_PROBE_H 1
#include <linux/types.h>
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 @@
* instead. This makes upgrade between e2fsprogs versions easy.
*/
-#ifndef __E2FSBB_H__
-#define __E2FSBB_H__ 1
+#ifndef E2FSBB_H
+#define E2FSBB_H 1
#include "libbb.h"
@@ -40,4 +40,4 @@ typedef long errcode_t;
#define WORDS_BIGENDIAN 1
#endif
-#endif /* __E2FSBB_H__ */
+#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 @@
*
* Copyright (C) 1991, 1992 Linus Torvalds
*/
-
-#ifndef _LINUX_EXT2_FS_H
-#define _LINUX_EXT2_FS_H
+#ifndef LINUX_EXT2_FS_H
+#define LINUX_EXT2_FS_H 1
#include "ext2_types.h" /* Changed from linux/types.h */
@@ -567,4 +566,4 @@ struct ext2_dir_entry_2 {
#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
~EXT2_DIR_ROUND)
-#endif /* _LINUX_EXT2_FS_H */
+#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 @@
* License.
* %End-Header%
*/
-
-#ifndef _EXT2FS_EXT2_IO_H
-#define _EXT2FS_EXT2_IO_H
+#ifndef EXT2FS_EXT2_IO_H
+#define EXT2FS_EXT2_IO_H 1
/*
* ext2_loff_t is defined here since unix_io.c needs it.
@@ -110,5 +109,4 @@ extern void (*test_io_cb_write_blk)
extern void (*test_io_cb_set_blksize)
(int blksize, errcode_t err);
-#endif /* _EXT2FS_EXT2_IO_H */
-
+#endif
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 @@
* License.
* %End-Header%
*/
-
-#ifndef _EXT2FS_EXT2FS_H
-#define _EXT2FS_EXT2FS_H
+#ifndef EXT2FS_EXT2FS_H
+#define EXT2FS_EXT2FS_H 1
#define EXT2FS_ATTR(x)
@@ -920,4 +919,4 @@ extern blk_t ext2fs_inode_data_blocks(ext2_filsys fs,
}
#endif
-#endif /* _EXT2FS_EXT2FS_H */
+#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 @@
* Definitions for transaction data structures for the buffer cache
* filesystem journaling support.
*/
-
-#ifndef _LINUX_JBD_H
-#define _LINUX_JBD_H
+#ifndef LINUX_JBD_H
+#define LINUX_JBD_H 1
#include <sys/types.h>
#include <linux/types.h>
@@ -233,4 +232,4 @@ extern void journal_brelse_array(struct buffer_head *b[], int n);
extern void journal_destroy_revoke(journal_t *);
-#endif /* _LINUX_JBD_H */
+#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 @@
/* vi: set sw=4 ts=4: */
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
+#ifndef LINUX_LIST_H
+#define LINUX_LIST_H 1
/*
* 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 @@
* DAMAGE.
* %End-Header%
*/
-
-#ifndef _UUID_UUID_H
-#define _UUID_UUID_H
+#ifndef UUID_UUID_H
+#define UUID_UUID_H 1
#include <sys/types.h>
#include <time.h>