Changeset 523


Ignore:
Timestamp:
Sep 20, 2013 5:44:46 AM (4 years ago)
Author:
bjarni
Message:

Updated header file CoinMP.h to remove warnings about multiple exports during 64-bit compile in stable 1.7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.7/CoinMP/src/CoinMP.h

    r486 r523  
    2121#if defined(_MSC_VER) && !defined(HAVE_CONFIG_H)
    2222
    23 #define SOLVCALL   __stdcall
    24 #ifdef SOLVER_EXPORT
    25 #define SOLVAPI  __declspec(dllexport)
    26 #else
    27 #define SOLVAPI __declspec(dllimport)
    28 #endif
    29 
    30 #else
    31 
    32 #define SOLVAPI
     23# define SOLVCALL   __stdcall
     24# if defined(SOLVER_EXPORT) && !defined(_WIN64)
     25#  define SOLVAPI  __declspec(dllexport)
     26# endif
     27# if defined(SOLVER_IMPORT)
     28#  define SOLVAPI __declspec(dllimport)
     29# endif
     30
     31#endif
     32
     33#ifndef SOLVAPI
     34#define SOLVAPI
     35#endif
     36
     37#ifndef SOLVCALL
    3338#define SOLVCALL
    34 
    35 #endif
     39#endif
     40
    3641
    3742
Note: See TracChangeset for help on using the changeset viewer.