diff --git a/CMakeLists.txt b/CMakeLists.txt index f952ae3..76f66f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ add_library(wsfs-adapter SHARED ${WSFS_ADAPTER_SOURCES} ${WSFS_COMMON_SOURCES}) set_target_properties(wsfs-adapter PROPERTIES VERSION ${PROJECT_VERSION}) set_target_properties(wsfs-adapter PROPERTIES SOVERSION 0) set_target_properties(wsfs-adapter PROPERTIES C_VISIBILITY_PRESET hidden) -set_target_properties(wsfs-adapter PROPERTIES COMPILE_DEFINITIONS "WSFS_API=WSFS_EXPORT") +set_target_properties(wsfs-adapter PROPERTIES COMPILE_DEFINITIONS "WSFSA_API=WSFSA_EXPORT") target_include_directories(wsfs-adapter PUBLIC lib ${EXTRA_INCLUDE_DIRS}) target_compile_options(wsfs-adapter PUBLIC ${EXTRA_CFLAGS}) diff --git a/include/wsfs/adapter/api.h b/include/wsfs/adapter/api.h index d718a1f..6cd6a32 100644 --- a/include/wsfs/adapter/api.h +++ b/include/wsfs/adapter/api.h @@ -1,15 +1,15 @@ #ifndef WSFS_ADAPTER_API_H #define WSFS_ADAPTER_API_H -#ifndef WSFS_API -#define WSFS_API +#ifndef WSFSA_API +#define WSFSA_API #endif -#ifndef WSFS_EXPORT +#ifndef WSFSA_EXPORT #ifdef __GNUC__ -#define WSFS_EXPORT __attribute__ ((visibility ("default"))) +#define WSFSA_EXPORT __attribute__ ((visibility ("default"))) #else -#define WSFS_EXPORT +#define WSFSA_EXPORT #endif #endif diff --git a/include/wsfs/adapter/server.h b/include/wsfs/adapter/server.h index 820221c..7886251 100644 --- a/include/wsfs/adapter/server.h +++ b/include/wsfs/adapter/server.h @@ -11,16 +11,16 @@ extern "C" { #endif -extern WSFS_API struct wsfs_server * wsfs_server_create( +extern WSFSA_API struct wsfs_server * wsfs_server_create( struct wsfs_server_config * config); -extern WSFS_API void wsfs_server_dispose( +extern WSFSA_API void wsfs_server_dispose( struct wsfs_server * server); -extern WSFS_API void wsfs_server_run( +extern WSFSA_API void wsfs_server_run( struct wsfs_server * server); -extern WSFS_API void wsfs_server_shutdown( +extern WSFSA_API void wsfs_server_shutdown( struct wsfs_server * server); #ifdef __cplusplus diff --git a/include/wsfs/adapter/server_config.h b/include/wsfs/adapter/server_config.h index e8e9f73..27c3bbe 100644 --- a/include/wsfs/adapter/server_config.h +++ b/include/wsfs/adapter/server_config.h @@ -18,13 +18,13 @@ extern "C" { #endif -extern WSFS_API void wsfs_server_config_init( +extern WSFSA_API void wsfs_server_config_init( struct wsfs_server_config * config); -extern WSFS_API void wsfs_server_config_cleanup( +extern WSFSA_API void wsfs_server_config_cleanup( struct wsfs_server_config * config); -extern WSFS_API void wsfs_server_config_clone( +extern WSFSA_API void wsfs_server_config_clone( struct wsfs_server_config * config, struct wsfs_server_config * clone); diff --git a/include/wsfs/adapter/server_protocol.h b/include/wsfs/adapter/server_protocol.h index cdb27b7..1af4cc1 100644 --- a/include/wsfs/adapter/server_protocol.h +++ b/include/wsfs/adapter/server_protocol.h @@ -11,13 +11,13 @@ extern "C" { #endif -extern WSFS_API struct wsfs_server_protocol * wsfs_server_protocol_create( +extern WSFSA_API struct wsfs_server_protocol * wsfs_server_protocol_create( char * mount_point); -extern WSFS_API void wsfs_server_protocol_dispose( +extern WSFSA_API void wsfs_server_protocol_dispose( struct wsfs_server_protocol * protocol); -extern WSFS_API void wsfs_server_protocol_init_lws( +extern WSFSA_API void wsfs_server_protocol_init_lws( struct wsfs_server_protocol * protocol, struct lws_protocols * lws_protocol);