From 51cf438fb071477c29f3a1d37784dce51a6fa6a3 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 7 Feb 2010 17:21:51 +0000 Subject: [PATCH] Fix dllexport usage, courtesy of Carlo Bramini in #48. --- caca/caca.h | 8 ++++---- caca/caca0.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/caca/caca.h b/caca/caca.h index 5d91167..fbe535b 100644 --- a/caca/caca.h +++ b/caca/caca.h @@ -1,6 +1,6 @@ /* * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2009 Sam Hocevar + * Copyright (c) 2002-2010 Sam Hocevar * All Rights Reserved * * $Id$ @@ -31,10 +31,10 @@ #endif #undef __extern -#if defined(_DOXYGEN_SKIP_ME) -#elif defined(_WIN32) && defined(__LIBCACA__) +#if defined _DOXYGEN_SKIP_ME +#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT # define __extern extern __declspec(dllexport) -#elif defined(_WIN32) +#elif defined _WIN32 && !defined __LIBCACA__ # define __extern extern __declspec(dllimport) #else # define __extern extern diff --git a/caca/caca0.h b/caca/caca0.h index cddd2ca..7c47700 100644 --- a/caca/caca0.h +++ b/caca/caca0.h @@ -23,10 +23,10 @@ #include #undef __extern -#if defined(_DOXYGEN_SKIP_ME) -#elif defined(_WIN32) && defined(__LIBCACA__) +#if defined _DOXYGEN_SKIP_ME +#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT # define __extern extern __declspec(dllexport) -#elif defined(_WIN32) +#elif defined _WIN32 && !defined __LIBCACA__ # define __extern extern __declspec(dllimport) #else # define __extern extern