diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 16203cbb..ec9d9d12 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(ds3 SHARED ds3_response_header_utils.h ds3_response_header_utils.c ds3_bool.h ds3_library_exports.h - ds3_test_exports.h) + ds3_marshaling.h) if (WIN32) set(CMAKE_BUILD_TYPE Release) @@ -90,7 +90,7 @@ else(WIN32) "ds3_response_header_utils.h" "ds3_bool.h" "ds3_library_exports.h" - "ds3_test_exports.h" + "ds3_marshaling.h" DESTINATION "/usr/local/include") install(TARGETS ds3 DESTINATION lib) diff --git a/src/ds3_marshaling.h b/src/ds3_marshaling.h index 5fb02e45..dcec5417 100644 --- a/src/ds3_marshaling.h +++ b/src/ds3_marshaling.h @@ -16,7 +16,6 @@ #ifndef DS3_MARSHALING_H #define DS3_MARSHALING_H -#include "ds3_test_exports.h" #include #ifdef __cplusplus @@ -41,10 +40,10 @@ typedef struct { size_t total_read; }ds3_xml_send_buff; -TEST_API xmlDocPtr ds3_generate_xml_ids(ds3_ids_list* ids_list); -TEST_API xmlDocPtr ds3_generate_xml_delete_objects(ds3_delete_objects_response* keys_list); -TEST_API xmlDocPtr ds3_generate_xml_complete_mpu(const ds3_complete_multipart_upload_response* mpu_list); -TEST_API xmlDocPtr ds3_generate_xml_bulk_objects_list(const ds3_bulk_object_list_response* obj_list, object_list_type list_type); +xmlDocPtr ds3_generate_xml_ids(ds3_ids_list* ids_list); +xmlDocPtr ds3_generate_xml_delete_objects(ds3_delete_objects_response* keys_list); +xmlDocPtr ds3_generate_xml_complete_mpu(const ds3_complete_multipart_upload_response* mpu_list); +xmlDocPtr ds3_generate_xml_bulk_objects_list(const ds3_bulk_object_list_response* obj_list, object_list_type list_type); #ifdef __cplusplus } diff --git a/src/ds3_test_exports.h b/src/ds3_test_exports.h deleted file mode 100644 index d6bd1bc2..00000000 --- a/src/ds3_test_exports.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * ****************************************************************************** - * Copyright 2014-2018 Spectra Logic Corporation. All Rights Reserved. - * Licensed under the Apache License, Version 2.0 (the "License"). You may not use - * this file except in compliance with the License. A copy of the License is located at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * or in the "license" file accompanying this file. - * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * **************************************************************************** - */ - -#ifndef DS3_TEST_EXPORTS_H -#define DS3_TEST_EXPORTS_H - -// For windows unit test symbol exports. -#ifdef _WIN32 -# ifdef TEST_EXPORTS -# define TEST_API __declspec(testexport) -# else -# define TEST_API __declspec(testimport) -# endif -#else -# define TEST_API -#endif - -#endif