Changeset 1236 for stable/1.8/Clp


Ignore:
Timestamp:
Jul 16, 2008 10:41:27 PM (12 years ago)
Author:
ladanyi
Message:

force cdecl on signal_handler() and main() if MS compiler is used (ticket #20)

Location:
stable/1.8/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.8/Clp/src/ClpMain.cpp

    r1230 r1236  
    6060
    6161extern "C" {
    62    static void signal_handler(int whichSignal)
     62   static void
     63#if defined(_MSC_VER)
     64   __cdecl
     65#endif // _MSC_VER
     66   signal_handler(int whichSignal)
    6367   {
    6468      if (currentModel!=NULL)
     
    8185int CbcOrClpRead_mode=1;
    8286FILE * CbcOrClpReadCommand=stdin;
    83 int main (int argc, const char *argv[])
     87
     88int
     89#if defined(_MSC_VER)
     90__cdecl
     91#endif // _MSC_VER
     92main (int argc, const char *argv[])
    8493{
    8594  // next {} is just to make sure all memory should be freed - for debug
  • stable/1.8/Clp/src/ClpSolve.cpp

    r1197 r1236  
    342342
    343343extern "C" {
    344    static void signal_handler(int whichSignal)
     344   static void
     345#if defined(_MSC_VER)
     346   __cdecl
     347#endif // _MSC_VER
     348   signal_handler(int whichSignal)
    345349   {
    346350      if (currentModel!=NULL)
Note: See TracChangeset for help on using the changeset viewer.