Merge pull request #185 from DenverM80/win_build_fix_print_uint64

Fix formatting of uint64_t print specifier macro and CMake config

Author: rpmoore

src/CMakeLists.txt

@@ -25,8 +25,7 @@ add_library(ds3 SHARED
 
 if (WIN32)
 
-    add_definitions(-DLIBRARY_EXPORTS -DCURL_STATICLIB -Dinline=__inline)
-    set_property(TARGET ds3 PROPERTY _CRT_SECURE_NO_WARNINGS)
+    add_definitions(-DLIBRARY_EXPORTS -DCURL_STATICLIB -Dinline=__inline -D__STDC_FORMAT_MACROS -D_CRT_SECURE_NO_WARNINGS)
     set_source_files_properties(ds3.c PROPERTIES LANGUAGE CXX)
 
     file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/win32" WINDOWS_DIR)

src/ds3.c

@@ -42,6 +42,7 @@
 #include <unistd.h>
 #endif
 
+
 #ifndef S_ISDIR
 #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #endif
@@ -1157,7 +1158,7 @@ static void _set_query_param_flag(const ds3_request* _request, const char* key,
 static void _set_query_param_uint64_t(const ds3_request* _request, const char* key, uint64_t value) {
     char string_buffer[UNSIGNED_LONG_LONG_BASE_10_STR_LEN];
     memset(string_buffer, 0, sizeof(string_buffer));
-    snprintf(string_buffer, sizeof(string_buffer), "%"PRIu64, value);
+    snprintf(string_buffer, sizeof(string_buffer), "%" PRIu64, value);
     _set_query_param(_request, key, string_buffer);
 }
 
@@ -3602,7 +3603,7 @@ static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_resp
 
     for (obj_index = 0; obj_index < obj_list->num_objects; obj_index++) {
         obj = obj_list->objects[obj_index];
-        g_snprintf(size_buff, sizeof(char) * UNSIGNED_LONG_LONG_BASE_10_STR_LEN, "%"PRIu64, obj->length);
+        g_snprintf(size_buff, sizeof(char) * UNSIGNED_LONG_LONG_BASE_10_STR_LEN, "%" PRIu64, obj->length);
 
         object_node = xmlNewNode(NULL, (xmlChar*) "Object");
         xmlAddChild(objects_node, object_node);

src/ds3.h

@@ -30,7 +30,6 @@
 #include "ds3_string_multimap.h"
 
 #ifdef __cplusplus
-#define __STDC_FORMAT_MACROS
 extern "C" {
 #endif
 
@@ -47,6 +46,7 @@ extern "C" {
 
 #define DS3_READFUNC_ABORT CURL_READFUNC_ABORT
 
+
 typedef struct {
     int page_truncated;
     int total_result_count;