summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-05 09:18:54 +0000
committerDenis Vlasenko2008-07-05 09:18:54 +0000
commita60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch)
treef59bc665cfe3d2d32622450d80523e3c1265e501 /libbb
parentf6efccc0659a2e2978f2021153f34ce92257ad2b (diff)
downloadbusybox-a60f84ebf07863e390b72a2b6150e461a1ec18e9.zip
busybox-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz
*: rename ATTRIBUTE_XXX to just XXX.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/appletlib.c2
-rw-r--r--libbb/bb_askpass.c2
-rw-r--r--libbb/messages.c2
-rw-r--r--libbb/recursive_action.c8
4 files changed, 7 insertions, 7 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 0017a4b..eb98f1c 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -738,7 +738,7 @@ void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
#if ENABLE_BUILD_LIBBUSYBOX
int lbb_main(char **argv)
#else
-int main(int argc ATTRIBUTE_UNUSED, char **argv)
+int main(int argc UNUSED_PARAM, char **argv)
#endif
{
#if defined(SINGLE_APPLET_MAIN)
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index ca18ade..fba82a0 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -13,7 +13,7 @@
#include "libbb.h"
/* do nothing signal handler */
-static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
+static void askpass_timeout(int UNUSED_PARAM ignore)
{
}
diff --git a/libbb/messages.c b/libbb/messages.c
index 74a070c..9009028 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -70,4 +70,4 @@ const char bb_path_wtmp_file[] ALIGN1 =
/* We use it for "global" data via *(struct global*)&bb_common_bufsiz1.
* Since gcc insists on aligning struct global's members, it would be a pity
* (and an alignment fault on some CPUs) to mess it up. */
-char bb_common_bufsiz1[COMMON_BUFSIZE] __attribute__(( aligned(sizeof(long long)) ));
+char bb_common_bufsiz1[COMMON_BUFSIZE] ALIGNED(sizeof(long long));
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index dbc31c3..07bd0ab 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -22,10 +22,10 @@
* is so stinking huge.
*/
-static int FAST_FUNC true_action(const char *fileName ATTRIBUTE_UNUSED,
- struct stat *statbuf ATTRIBUTE_UNUSED,
- void* userData ATTRIBUTE_UNUSED,
- int depth ATTRIBUTE_UNUSED)
+static int FAST_FUNC true_action(const char *fileName UNUSED_PARAM,
+ struct stat *statbuf UNUSED_PARAM,
+ void* userData UNUSED_PARAM,
+ int depth UNUSED_PARAM)
{
return TRUE;
}