Changeset 4325


Ignore:
Timestamp:
02/07/10 18:21:51 (3 years ago)
Author:
sam
Message:

Fix dllexport usage, courtesy of Carlo Bramini in #48.

Location:
libcaca/trunk/caca
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libcaca/trunk/caca/caca.h

    r4323 r4325  
    11/* 
    22 *  libcaca       Colour ASCII-Art library 
    3  *  Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net> 
     3 *  Copyright (c) 2002-2010 Sam Hocevar <sam@hocevar.net> 
    44 *                All Rights Reserved 
    55 * 
    … …  
    3232 
    3333#undef __extern 
    34 #if defined(_DOXYGEN_SKIP_ME) 
    35 #elif defined(_WIN32) && defined(__LIBCACA__) 
     34#if defined _DOXYGEN_SKIP_ME 
     35#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT 
    3636#   define __extern extern __declspec(dllexport) 
    37 #elif defined(_WIN32) 
     37#elif defined _WIN32 && !defined __LIBCACA__ 
    3838#   define __extern extern __declspec(dllimport) 
    3939#else 

  • libcaca/trunk/caca/caca0.h

    r4324 r4325  
    2424 
    2525#undef __extern 
    26 #if defined(_DOXYGEN_SKIP_ME) 
    27 #elif defined(_WIN32) && defined(__LIBCACA__) 
     26#if defined _DOXYGEN_SKIP_ME 
     27#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT 
    2828#   define __extern extern __declspec(dllexport) 
    29 #elif defined(_WIN32) 
     29#elif defined _WIN32 && !defined __LIBCACA__ 
    3030#   define __extern extern __declspec(dllimport) 
    3131#else 
Note: See TracChangeset for help on using the changeset viewer.