Ticket #16854: msw_vc14_compiler_fixes.diff

File msw_vc14_compiler_fixes.diff, 1.4 KB (added by es0m_, 5 years ago)

fixes for compiler.h, libtiff to support vc14/vs2015

  • include/wx/compiler.h

    diff --git include/wx/compiler.h include/wx/compiler.h
    index 4d334d7..67164b6 100644
     
    4949#   define __VISUALC11__
    5050#elif __VISUALC__ < 1900
    5151#   define __VISUALC12__
     52#elif __VISUALC__ < 2000
     53#   define __VISUALC14__
    5254#else
    5355#   pragma message("Please update wx/compiler.h to recognize this VC++ version")
    5456#endif
  • src/tiff/libtiff/tif_config.h

    diff --git src/tiff/libtiff/tif_config.h src/tiff/libtiff/tif_config.h
    index 775a34b..b86dfdc 100644
     
    364364/* Set the native cpu bit order */
    365365#define HOST_FILLORDER FILLORDER_LSB2MSB
    366366
    367 #define snprintf _snprintf
     367#if defined(_MSC_VER) && _MSC_VER<1900
     368#  define snprintf _snprintf
     369#endif
    368370
    369371/* Define to 1 if your processor stores words with the most significant byte
    370372   first (like Motorola and SPARC, unlike Intel and VAX). */
  • src/tiff/libtiff/tif_config.vc.h

    diff --git src/tiff/libtiff/tif_config.vc.h src/tiff/libtiff/tif_config.vc.h
    index c297cf3..c81a94a 100644
     
    4747/* Set the native cpu bit order */
    4848#define HOST_FILLORDER FILLORDER_LSB2MSB
    4949
    50 #define snprintf _snprintf
     50#if defined(_MSC_VER) && _MSC_VER<1900
     51#  define snprintf _snprintf
     52#endif
    5153
    5254/* Define to 1 if your processor stores words with the most significant byte
    5355   first (like Motorola and SPARC, unlike Intel and VAX). */