aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2005-06-09 03:00:32 (GMT)
committerJouni Malinen <j@w1.fi>2005-06-09 03:00:32 (GMT)
commitfe1b44e1f5031a7239a8214eec1cd2764b4e9218 (patch)
treeb5c8754f4f82361a84465886b4b85f26861fcc43
parentc45b000fcc0f9d796d115228fab548b3c0ddf25c (diff)
downloadhostap-history-fe1b44e1f5031a7239a8214eec1cd2764b4e9218.zip
hostap-history-fe1b44e1f5031a7239a8214eec1cd2764b4e9218.tar.gz
hostap-history-fe1b44e1f5031a7239a8214eec1cd2764b4e9218.tar.bz2
Merged from CVS trunk into hostap_0_3_branch:
PatchSet 2658 Date: 2005/06/09 03:57:48 Author: jm Branch: HEAD Tag: (none) Log: Date: Tue, 07 Jun 2005 23:33:14 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> Subject: cvs commit: src/contrib/wpa_supplicant common.h sam 2005-06-07 23:33:14 UTC FreeBSD src repository Modified files: contrib/wpa_supplicant common.h Log: fix byte order handling: FreeBSD != Linux Revision Changes Path 1.2 +6 -0 src/contrib/wpa_supplicant/common.h http://cvsweb.FreeBSD.org/src/contrib/wpa_supplicant/common.h.diff?r1=1.1&r2=1.2 Members: hostapd/common.h:1.17->1.18
-rw-r--r--hostapd/common.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/hostapd/common.h b/hostapd/common.h
index 2669f9a..0f154e9 100644
--- a/hostapd/common.h
+++ b/hostapd/common.h
@@ -8,8 +8,12 @@
#ifdef __FreeBSD__
#include <sys/types.h>
#include <sys/endian.h>
+#define __BYTE_ORDER _BYTE_ORDER
+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
+#define __BIG_ENDIAN _BIG_ENDIAN
#define bswap_16 bswap16
#define bswap_32 bswap32
+#define bswap_64 bswap64
#endif
#ifdef CONFIG_NATIVE_WINDOWS
@@ -130,16 +134,6 @@ void fprint_char(FILE *f, char c);
enum { MSG_MSGDUMP, MSG_DEBUG, MSG_INFO, MSG_WARNING, MSG_ERROR };
-#ifdef CONFIG_NO_STDOUT_DEBUG
-
-#define wpa_printf(args...) do { } while (0)
-#define wpa_hexdump(args...) do { } while (0)
-#define wpa_hexdump_key(args...) do { } while (0)
-#define wpa_hexdump_ascii(args...) do { } while (0)
-#define wpa_hexdump_ascii_key(args...) do { } while (0)
-
-#else /* CONFIG_NO_STDOUT_DEBUG */
-
/**
* wpa_printf - conditional printf
* @level: priority level (MSG_*) of the message
@@ -215,9 +209,6 @@ void wpa_hexdump_ascii(int level, const char *title, const u8 *buf,
void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
size_t len);
-#endif /* CONFIG_NO_STDOUT_DEBUG */
-
-
#ifdef EAPOL_TEST
#define WPA_ASSERT(a) \
do { \