Changeset 1498


Ignore:
Timestamp:
05/13/06 23:15:46 (8 years ago)
Author:
wehart
Message:

Misc portability fixes for MINGW. Mostly, these fixes will cause aborts,
so I'm not really 'porting' the code. The WIN32 port will be
time consuming...

( Links to Acro-related mail archives at  http://software.sandia.gov/Acro/ )

Location:
colin/trunk/colin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • colin/trunk/colin/AnalysisCode.h

    r1480 r1498  
    232232      char tmp[256]; 
    233233      sprintf(tmp,"/tmp/colin_paramFName_%d_XXXXXX",getpid()); 
     234      #if defined(__MINGW32__) 
     235      abort(); 
     236      #else 
    234237      modifiedParamsFileName = mkstemp(tmp); 
     238      #endif 
    235239      } 
    236240   else { 
     
    243247      char tmp[256]; 
    244248      sprintf(tmp,"/tmp/colin_resultsFName_%d_XXXXXX",getpid()); 
     249      #if defined(__MINGW32__) 
     250      abort(); 
     251      #else 
    245252      modifiedResultsFileName = mkstemp(tmp); 
     253      #endif 
    246254      } 
    247255   else { 
  • colin/trunk/colin/CommandShell.h

    r1482 r1498  
    1919#include <acro_config.h> 
    2020#include <utilib/std_headers.h> 
    21 #if !defined(_MSC_VER) 
     21#if !defined(_MSC_VER) && !defined(__MINGW32__) 
    2222#include <sys/wait.h> 
    2323#include <sys/types.h> 
     
    3636#if 0 
    3737return system(command); 
    38 #elif defined(_MSC_VER) 
     38#elif defined(_MSC_VER) || defined(__MINGW32__) 
    3939   abort(); 
    4040#else 
  • colin/trunk/colin/SysCallApplication.h

    r1481 r1498  
    1717#define colin_SysCallApplication_h 
    1818 
     19#ifdef __MINGW32__ 
     20#include <_mingw.h> 
     21#include <windows.h> 
     22#endif 
    1923#include <acro_config.h> 
    2024#include <utilib/std_headers.h> 
     
    9397  // 
    9498  if (!flag) 
     99     #if defined(__MINGW32__) 
     100     Sleep(1000); 
     101     #else 
    95102     sleep(1); 
     103     #endif 
    96104  // 
    97105  // Q: do we need to keep a list of points that are associated with async 
Note: See TracChangeset for help on using the changeset viewer.