Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix use of extern in declarations, following libtool docs #9

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix use of extern in declarations, following libtool docs #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions include/libfmapi.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,49 +311,49 @@ int libfmapi_one_off_entry_identifier_get_utf16_email_address(
* MAPI class identifiers
* ------------------------------------------------------------------------- */

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_mapi[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_public_strings[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_internet_headers[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_appointment[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_task[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_address[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_common[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_journal[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_sticky_note[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_sharing[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_rss_feed[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_unified_messaging[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_calendar[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_air_sync[ 16 ];

LIBFMAPI_EXTERN \
LIBFMAPI_EXTERN_VARIABLE \
uint8_t libfmapi_class_identifier_attachment[ 16 ];

/* -------------------------------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions include/libfmapi/extern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@
#define LIBFMAPI_EXTERN __declspec(dllexport)

#elif defined( LIBFMAPI_DLL_IMPORT )
#define LIBFMAPI_EXTERN extern __declspec(dllimport)
#define LIBFMAPI_EXTERN __declspec(dllimport)

#else
#define LIBFMAPI_EXTERN extern
#define LIBFMAPI_EXTERN

#endif

#define LIBFMAPI_EXTERN_VARIABLE extern LIBFMAPI_EXTERN

#endif /* !defined( _LIBFMAPI_EXTERN_H ) */

8 changes: 1 addition & 7 deletions libfmapi/libfmapi_extern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,8 @@

#include <libfmapi/extern.h>

#if defined( __CYGWIN__ ) || defined( __MINGW32__ )
#define LIBFMAPI_EXTERN_VARIABLE extern
#else
#define LIBFMAPI_EXTERN_VARIABLE LIBFMAPI_EXTERN
#endif

#else
#define LIBFMAPI_EXTERN /* extern */
#define LIBFMAPI_EXTERN
#define LIBFMAPI_EXTERN_VARIABLE extern

#endif /* !defined( HAVE_LOCAL_LIBFMAPI ) */
Expand Down