Skip to content

Commit fec1d79

Browse files
committed
Fix IRECV_API definitions
1 parent 4fa4941 commit fec1d79

3 files changed

Lines changed: 21 additions & 10 deletions

File tree

configure.ac

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ AS_IF([test "x$with_dummy" = "xyes"], [
141141
])
142142

143143
AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -fvisibility=hidden")
144+
145+
if test "x$enable_static" = "xyes" -a "x$enable_shared" = "xno"; then
146+
GLOBAL_CFLAGS+=" -DIRECV_STATIC"
147+
fi
148+
144149
AC_SUBST(GLOBAL_CFLAGS)
145150
AC_SUBST(GLOBAL_LDFLAGS)
146151

include/libirecovery.h

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,11 @@ extern "C" {
2727

2828
#include <stdint.h>
2929

30-
#ifdef IRECV_STATIC
31-
#define IRECV_API
32-
#elif defined(_WIN32)
33-
#ifdef DLL_EXPORT
34-
#define IRECV_API __declspec(dllexport)
35-
#else
30+
#ifndef IRECV_API
31+
#ifdef IRECV_STATIC
32+
#define IRECV_API
33+
#elif defined(_WIN32)
3634
#define IRECV_API __declspec(dllimport)
37-
#endif
38-
#else
39-
#if __GNUC__ >= 4
40-
#define IRECV_API __attribute__((visibility("default")))
4135
#else
4236
#define IRECV_API
4337
#endif

src/libirecovery.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@
5757
#endif
5858
#endif
5959

60+
#ifdef IRECV_STATIC
61+
#define IRECV_API
62+
#elif defined(_WIN32)
63+
#define IRECV_API __declspec( dllexport )
64+
#else
65+
#if __GNUC__ >= 4
66+
#define IRECV_API __attribute__((visibility("default")))
67+
#else
68+
#define IRECV_API
69+
#endif
70+
#endif
71+
6072
#include "libirecovery.h"
6173

6274
struct irecv_client_private {

0 commit comments

Comments
 (0)