Merge pull request #166 from DenverM80/fix_cmake_merge

Do not expose ds3_connections and url_endoding to the SDK; Fix test e…

Author: GraciesPadre

src/ds3_connection.h

@@ -20,17 +20,6 @@
 extern "C" {
 #endif
 
-// For windows DLL symbol exports.
-#ifdef _WIN32
-#    ifdef LIBRARY_EXPORTS
-#        define LIBRARY_API __declspec(dllexport)
-#    else
-#        define LIBRARY_API __declspec(dllimport)
-#    endif
-#else
-#    define LIBRARY_API
-#endif
-
 #include <curl/curl.h>
 #include <glib.h>
 
@@ -50,11 +39,11 @@ struct _ds3_connection_pool{
     ds3_condition available_connections;
 };
 
-LIBRARY_API ds3_connection_pool* ds3_connection_pool_init(void);
-LIBRARY_API void ds3_connection_pool_clear(ds3_connection_pool* pool);
+ds3_connection_pool* ds3_connection_pool_init(void);
+void ds3_connection_pool_clear(ds3_connection_pool* pool);
 
-LIBRARY_API ds3_connection* ds3_connection_acquire(ds3_connection_pool* pool);
-LIBRARY_API void ds3_connection_release(ds3_connection_pool* pool, ds3_connection* handle);
+ds3_connection* ds3_connection_acquire(ds3_connection_pool* pool);
+void ds3_connection_release(ds3_connection_pool* pool, ds3_connection* handle);
 
 #ifdef __cplusplus
 }

src/ds3_net.h

@@ -24,10 +24,10 @@ extern "C" {
 #include "ds3_string_multimap.h"
 #include "ds3_connection.h"
 
-LIBRARY_API char* escape_url(const char* url);
-LIBRARY_API char* escape_url_extended(const char* url, const char** delimiters, uint32_t num_delimiters);
-LIBRARY_API char* escape_url_object_name(const char* url);
-LIBRARY_API char* escape_url_range_header(const char* url);
+char* escape_url(const char* url);
+char* escape_url_extended(const char* url, const char** delimiters, uint32_t num_delimiters);
+char* escape_url_object_name(const char* url);
+char* escape_url_range_header(const char* url);
 
 ds3_error* net_process_request(
    const ds3_client* client,

test/checksum.cpp

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glib.h>
 
 //global variables
 gchar* result_1;

test/job_tests.cpp

@@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE( GetJobToReplicateRequestHandler_response_type_not_parsed )
 
     // Replicate the job
     request = ds3_init_get_job_to_replicate_spectra_s3_request(job_id->value);
-    error = ds3_get_job_to_replicate_spectra_s3_request(client, request, &response_str);
+    error = ds3_get_job_to_replicate_spectra_s3_request(client, request, response_str);
 
     BOOST_CHECK(error == NULL);
     BOOST_CHECK(response_str->size > 0);