Changes between Initial Version and Version 2 of Ticket #1810


Ignore:
Timestamp:
Sep 10, 2007, 4:40:06 PM (17 years ago)
Author:
warmerdam
Comment:

Patch applied (r12110), the configure changes look fine. I did a few tweaks to text to keep the option to one line and grouped the end-of-configure report a bit differently. I also upstreamed the shapefil.h change into shapelib so the next time we pull that down we won't lose it.

I don't have gcc4 on my system so I can't easily check this. I see the buildbot.osgeo.org uses gcc 4.0.2, so I'm reassigning this to Mateusz to modify buildbot to use this configure option.

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #1810

    • Property Cc warmerdam added
    • Property Keywords gcc added
    • Property Component GDAL_Raster → ConfigBuild
    • Property Owner changed from warmerdam to Mateusz Łoskot

  • Ticket #1810 – Description

    initial v2  
    3333#ifndef CPL_DLL
    3434#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL)
    35 #  define CPL_DLL     __declspec(dllexport)
     35#  define CPL_DLL    __declspec(dllexport)
    3636#else
    37 #  if defined(__GNUC__) && __GNUC__ >= 4
    38 #    define CPL_DLL     __attribute__ ((visibility("default")))
    39 #  else
    40 #    define CPL_DLL
    41 #  endif
     37#  if defined(__GNUC__) && __GNUC__ >= 4
     38#    define CPL_DLL    __attribute__ ((visibility("default")))
     39#  else
     40#    define CPL_DLL
     41#  endif
    4242#endif
    4343#endif
    … …  
    5151{{{
    5252#ifndef SHPAPI_CALL
    53 #  if defined(__GNUC__) && __GNUC__ >= 4
    54 #    define SHPAPI_CALL     __attribute__ ((visibility("default")))
    55 #    define SHPAPI_CALL1(x) __attribute__ ((visibility("default")))     x
    56 #  else
    57 #    define SHPAPI_CALL
    58 #  endif
     53#  if defined(__GNUC__) && __GNUC__ >= 4
     54#    define SHPAPI_CALL    __attribute__ ((visibility("default")))
     55#    define SHPAPI_CALL1(x) __attribute__ ((visibility("default")))    x
     56#  else
     57#    define SHPAPI_CALL
     58#  endif
    5959#endif
    6060}}}