ソースを参照

Fix build for VS2008

Stefan Profanter 6 年 前
コミット
20440bcd6b
共有4 個のファイルを変更した8 個の追加8 個の削除を含む
  1. 1 1
      include/ua_config.h.in
  2. 2 2
      src/server/ua_server_worker.c
  3. 1 1
      src/server/ua_services_discovery_multicast.c
  4. 4 4
      src/ua_types.c

+ 1 - 1
include/ua_config.h.in

@@ -61,7 +61,7 @@ extern "C" {
 #endif
 
 // Disable deprecation warnings for sprintf, strncpy, strerror
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
 # define _CRT_SECURE_NO_WARNINGS
 #endif
 

+ 2 - 2
src/server/ua_server_worker.c

@@ -344,10 +344,10 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
         // need to use select with timeout on the multicast socket
         // server->mdnsSocket (see example in mdnsd library) on higher level.
         UA_DateTime multicastNextRepeat = 0;
-        UA_Boolean hasNext =
+        UA_StatusCode hasNext =
             iterateMulticastDiscoveryServer(server, &multicastNextRepeat,
                                             UA_TRUE);
-        if(hasNext && multicastNextRepeat < nextRepeated)
+        if(hasNext == UA_STATUSCODE_GOOD && multicastNextRepeat < nextRepeated)
             nextRepeated = multicastNextRepeat;
     }
 #endif

+ 1 - 1
src/server/ua_services_discovery_multicast.c

@@ -490,7 +490,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
 
     // TXT record: [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,...
     if(createTxt) {
-        char *pathChars = UA_alloca(path->length + 1);
+        char *pathChars = (char *)UA_alloca(path->length + 1);
         memcpy(pathChars, path->data, path->length);
         pathChars[path->length] = 0;
         mdns_create_txt(server, fullServiceDomain, pathChars, capabilites,

+ 4 - 4
src/ua_types.c

@@ -78,7 +78,7 @@ UA_String_fromChars(char const src[]) {
     return str;
 }
 
-bool
+UA_Boolean
 UA_String_equal(const UA_String *s1, const UA_String *s2) {
     if(s1->length != s2->length)
         return false;
@@ -153,7 +153,7 @@ UA_DateTime_toString(UA_DateTime t) {
 }
 
 /* Guid */
-bool
+UA_Boolean
 UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2) {
     if(memcmp(g1, g2, sizeof(UA_Guid)) == 0)
         return true;
@@ -230,7 +230,7 @@ NodeId_copy(UA_NodeId const *src, UA_NodeId *dst, const UA_DataType *_) {
     return retval;
 }
 
-bool
+UA_Boolean
 UA_NodeId_isNull(const UA_NodeId *p) {
     if(p->namespaceIndex != 0)
         return false;
@@ -255,7 +255,7 @@ UA_NodeId_isNull(const UA_NodeId *p) {
     return (p->identifier.string.length == 0);
 }
 
-bool
+UA_Boolean
 UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2) {
     if(n1->namespaceIndex != n2->namespaceIndex ||
        n1->identifierType!=n2->identifierType)