datapath: Include net/udp.h in vport-capwap.c

[openvswitch] / lib / util.h

diff --git a/lib/util.h b/lib/util.h
index 9df6db5836833522dfeb955fa98e19354f232fda..9eca8ec9adb09b029729a40f922ce5748c1854a7 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -80,7 +80,7 @@ extern const char *program_name;
 /* Given POINTER, the address of the given MEMBER in a STRUCT object, returns
    the STRUCT object. */
 #define CONTAINER_OF(POINTER, STRUCT, MEMBER)                           \
-        ((STRUCT *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER)))
+        ((STRUCT *) (void *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER)))
 
 #ifdef  __cplusplus
 extern "C" {
@@ -88,7 +88,7 @@ extern "C" {
 
 void set_program_name(const char *);
 
-void ovs_print_version(char *date, char *time, 
+void ovs_print_version(char *date, char *time,
                        uint8_t min_ofp, uint8_t max_ofp);
 #define OVS_PRINT_VERSION(min_ofp, max_ofp) \
         ovs_print_version(__DATE__, __TIME__, (min_ofp), (max_ofp))