diff options
| author | sam <sam@FreeBSD.org> | 2008-03-24 19:57:51 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-03-24 19:57:51 +0000 |
| commit | 93d12b102bd55b4360243769502f31b10ee524b9 (patch) | |
| tree | 0d5d6c53bf711232c470f6277e62e5a5c0674309 /contrib/wpa_supplicant/common.h | |
| parent | bc895c971f511040199035dae5f9de6d5c12827d (diff) | |
| download | FreeBSD-src-93d12b102bd55b4360243769502f31b10ee524b9.zip FreeBSD-src-93d12b102bd55b4360243769502f31b10ee524b9.tar.gz | |
resolve merge conflicts
MFC after: 3 weeks
Diffstat (limited to 'contrib/wpa_supplicant/common.h')
| -rw-r--r-- | contrib/wpa_supplicant/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/wpa_supplicant/common.h b/contrib/wpa_supplicant/common.h index ae70600..a1d952b 100644 --- a/contrib/wpa_supplicant/common.h +++ b/contrib/wpa_supplicant/common.h @@ -266,12 +266,12 @@ enum { MSG_MSGDUMP, MSG_DEBUG, MSG_INFO, MSG_WARNING, MSG_ERROR }; #define wpa_hexdump_key(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0) -#define wpa_debug_open_file() do { } while (0) +#define wpa_debug_open_file(p) do { } while (0) #define wpa_debug_close_file() do { } while (0) #else /* CONFIG_NO_STDOUT_DEBUG */ -int wpa_debug_open_file(void); +int wpa_debug_open_file(const char *path); void wpa_debug_close_file(void); /** |
