[src/trunk]: src/external/bsd/wpa/dist/src WPA_TRACE_REF() provides optional ...

[plunky <plunky%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2759c9172e63
branches:  trunk
changeset: 781572:2759c9172e63
user:      plunky <plunky%NetBSD.org@localhost>
date:      Sat Sep 15 18:37:27 2012 +0000

description:
WPA_TRACE_REF() provides optional content, potentially leaving an extra
semicolon within the struct declarator list. This is not permitted
according to C99 "6.7.2.1 Structure and union specifiers", so instead
have the macro provide the semicolon as required.

diffstat:

 external/bsd/wpa/dist/src/drivers/driver_test.c |  2 +-
 external/bsd/wpa/dist/src/utils/eloop.c         |  8 ++++----
 external/bsd/wpa/dist/src/utils/trace.h         |  2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 21509f7fdf8c -r 2759c9172e63 external/bsd/wpa/dist/src/drivers/driver_test.c
--- a/external/bsd/wpa/dist/src/drivers/driver_test.c   Sat Sep 15 18:12:17 2012 +0000
+++ b/external/bsd/wpa/dist/src/drivers/driver_test.c   Sat Sep 15 18:37:27 2012 +0000
@@ -70,7 +70,7 @@
 struct wpa_driver_test_data {
        struct wpa_driver_test_global *global;
        void *ctx;
-       WPA_TRACE_REF(ctx);
+       WPA_TRACE_REF(ctx)
        u8 own_addr[ETH_ALEN];
        int test_socket;
 #ifdef DRIVER_TEST_UNIX
diff -r 21509f7fdf8c -r 2759c9172e63 external/bsd/wpa/dist/src/utils/eloop.c
--- a/external/bsd/wpa/dist/src/utils/eloop.c   Sat Sep 15 18:12:17 2012 +0000
+++ b/external/bsd/wpa/dist/src/utils/eloop.c   Sat Sep 15 18:37:27 2012 +0000
@@ -25,8 +25,8 @@
        void *eloop_data;
        void *user_data;
        eloop_sock_handler handler;
-       WPA_TRACE_REF(eloop);
-       WPA_TRACE_REF(user);
+       WPA_TRACE_REF(eloop)
+       WPA_TRACE_REF(user)
        WPA_TRACE_INFO
 };
 
@@ -36,8 +36,8 @@
        void *eloop_data;
        void *user_data;
        eloop_timeout_handler handler;
-       WPA_TRACE_REF(eloop);
-       WPA_TRACE_REF(user);
+       WPA_TRACE_REF(eloop)
+       WPA_TRACE_REF(user)
        WPA_TRACE_INFO
 };
 
diff -r 21509f7fdf8c -r 2759c9172e63 external/bsd/wpa/dist/src/utils/trace.h
--- a/external/bsd/wpa/dist/src/utils/trace.h   Sat Sep 15 18:12:17 2012 +0000
+++ b/external/bsd/wpa/dist/src/utils/trace.h   Sat Sep 15 18:37:27 2012 +0000
@@ -29,7 +29,7 @@
        const void *addr;
        WPA_TRACE_INFO
 };
-#define WPA_TRACE_REF(name) struct wpa_trace_ref wpa_trace_ref_##name
+#define WPA_TRACE_REF(name) struct wpa_trace_ref wpa_trace_ref_##name;
 
 #define wpa_trace_dump(title, ptr) \
        wpa_trace_dump_func((title), (ptr)->btrace, (ptr)->btrace_num)