From a60f84ebf07863e390b72a2b6150e461a1ec18e9 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 5 Jul 2008 09:18:54 +0000
Subject: *: rename ATTRIBUTE_XXX to just XXX.

---
 networking/udhcp/arpping.c    | 2 +-
 networking/udhcp/common.h     | 4 ++--
 networking/udhcp/dhcpc.c      | 2 +-
 networking/udhcp/dhcpd.c      | 2 +-
 networking/udhcp/dhcprelay.c  | 2 +-
 networking/udhcp/dumpleases.c | 2 +-
 networking/udhcp/files.c      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'networking/udhcp')

diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index a8a458468..44815ad74 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -30,7 +30,7 @@ struct arpMsg {
 	uint8_t  tHaddr[6];     /* 20 target's hardware address */
 	uint8_t  tInaddr[4];    /* 26 target's IP address */
 	uint8_t  pad[18];       /* 2a pad for min. ethernet payload (60 bytes) */
-} ATTRIBUTE_PACKED;
+} PACKED;
 
 enum {
 	ARP_MSG_SIZE = 0x2a
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index bf0ecc7b1..0f3b79647 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -43,13 +43,13 @@ struct dhcpMessage {
 	uint8_t file[128];
 	uint32_t cookie;
 	uint8_t options[DHCP_OPTIONS_BUFSIZE + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS];
-} ATTRIBUTE_PACKED;
+} PACKED;
 
 struct udp_dhcp_packet {
 	struct iphdr ip;
 	struct udphdr udp;
 	struct dhcpMessage data;
-} ATTRIBUTE_PACKED;
+} PACKED;
 
 /* Let's see whether compiler understood us right */
 struct BUG_bad_sizeof_struct_udp_dhcp_packet {
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index d2138dd45..5caa00c83 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -123,7 +123,7 @@ static uint8_t* alloc_dhcp_option(int code, const char *str, int extra)
 
 
 int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 {
 	uint8_t *temp, *message;
 	char *str_c, *str_V, *str_h, *str_F, *str_r;
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index a6264ad2f..0cd6b9d50 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -23,7 +23,7 @@ struct dhcpOfferedAddr *leases;
 
 
 int udhcpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int udhcpd_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 {
 	fd_set rfds;
 	struct timeval tv;
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 08fb733d7..90ecf4831 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -236,7 +236,7 @@ static void pass_back(struct dhcpMessage *p, int packet_len, int *fds)
 }
 
 static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **clients,
-		struct sockaddr_in *server_addr, uint32_t gw_ip) ATTRIBUTE_NORETURN;
+		struct sockaddr_in *server_addr, uint32_t gw_ip) NORETURN;
 static void dhcprelay_loop(int *fds, int num_sockets, int max_socket, char **clients,
 		struct sockaddr_in *server_addr, uint32_t gw_ip)
 {
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index c98005f13..3e193903d 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -7,7 +7,7 @@
 #include "dhcpd.h"
 
 int dumpleases_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dumpleases_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int dumpleases_main(int argc UNUSED_PARAM, char **argv)
 {
 	int fd;
 	int i;
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 58498f9ef..eaa50b807 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -155,7 +155,7 @@ static int read_opt(const char *const_line, void *arg)
 	char *line;
 	const struct dhcp_option *option;
 	int retval, length, idx;
-	char buffer[8] __attribute__((aligned(4)));
+	char buffer[8] ALIGNED(4);
 	uint16_t *result_u16 = (uint16_t *) buffer;
 	uint32_t *result_u32 = (uint32_t *) buffer;
 
-- 
cgit v1.2.3