IOT-1448 - Fix Windows x86 Build issue 85/13185/4
authorMike Fenelon <mike.fenelon@microsoft.com>
Wed, 12 Oct 2016 23:26:12 +0000 (16:26 -0700)
committerDave Thaler <dthaler@microsoft.com>
Fri, 14 Oct 2016 19:41:30 +0000 (19:41 +0000)
The affected test were processing the windows
include files before the iotivity_config.h
could set the preprocessor config.

Update callback calling convention

Change-Id: I9adbfafef2c2e1b117a37ad9003ff53bb0450656
Signed-off-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13185
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c
resource/csdk/stack/test/linux/occlient.c
resource/csdk/stack/test/linux/ocserver.c

index 5d3f37b..1e86d3f 100644 (file)
@@ -157,9 +157,9 @@ static HANDLE g_CAIPNetworkMonitorChangeNotificationHandle = NULL;
  * @param[in]  row               Interface that changed, or NULL on the initial callback.
  * @param[in]  notificationType  Type of change that occurred.
  */
-static void IpAddressChangeCallback(void *context,
-                                    MIB_UNICASTIPADDRESS_ROW *row,
-                                    MIB_NOTIFICATION_TYPE notificationType)
+static void CALLBACK IpAddressChangeCallback(void *context,
+                                             MIB_UNICASTIPADDRESS_ROW *row,
+                                             MIB_NOTIFICATION_TYPE notificationType)
 {
     oc_mutex_lock(g_CAIPNetworkMonitorMutex);
 
index 0de8db5..7bb976a 100644 (file)
@@ -19,6 +19,8 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 
+#include <ocstack.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,7 +31,6 @@
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
-#include <ocstack.h>
 #include <logger.h>
 
 #define TAG ("occlient")
index ecc2c86..ad07637 100644 (file)
@@ -19,6 +19,8 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 
+#include <ocstack.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -30,7 +32,6 @@
 #endif
 #include <signal.h>
 #include <stdbool.h>
-#include <ocstack.h>
 #include <logger.h>
 
 #define TAG ("ocserver")