Revision 1567

trunk/src/linad99/dvector.cpp (revision 1567)
19 19
  int heapcheck(void);
20 20
#endif
21 21

  
22
#ifdef __MSVC32__
22
#ifdef _MSC_VER
23 23
#include <memory.h>
24 24
#endif
25 25

  
trunk/src/df1b2-separable/df1b2fun.h (revision 1567)
131 131

  
132 132
typedef void * &  vreference;
133 133

  
134
#if !defined(__MSVC32__)
134
#if !defined(_MSC_VER)
135 135
inline void increment_pointer(vreference p,int n)
136 136
{
137 137
  char * cs =(char*)(p);
trunk/src/df1b2-separable/df1b2lp6.cpp (revision 1567)
32 32
  const dvector& grad);
33 33

  
34 34
#if defined(USE_DD_STUFF)
35
#  if defined(__MSVC32__)
35
#  if defined(_MSC_VER)
36 36
    extern "C" _export  void dd_newton_raphson(int n,double * v,double * diag,
37 37
      double * ldiag, double * yy);
38 38
#  else
trunk/src/df1b2-separable/df1b2lp11.cpp (revision 1567)
25 25
  const dmatrix& _Hessadjoint,function_minimizer * pmin);
26 26

  
27 27
#if defined(USE_DD_STUFF)
28
#  if defined(__MSVC32__)
28
#  if defined(_MSC_VER)
29 29
    extern "C" _export  void dd_newton_raphson(int n,double * v,double * diag,
30 30
      double * ldiag, double * yy);
31 31
#  else
trunk/src/df1b2-separable/smartbuf.cpp (revision 1567)
11 11
#define HOME_VERSION
12 12
#include "fvar.hpp"
13 13
#include "smartbuf.h"
14
#ifdef __MSVC32__
14
#ifdef _MSC_VER
15 15
  #define lseek _lseek
16 16
  #define  read _read
17 17
  #define write _write
......
85 85
#include <fcntl.h>
86 86
#include <sys/stat.h>
87 87
#include <sys/types.h>
88
#ifndef __MSVC32__
88
#ifndef __MSC_VER
89 89
#include <unistd.h>
90 90
#endif
91 91
#endif
......
315 315
 */
316 316
void byte_copy(void* dest, void* source, unsigned num_bytes)
317 317
{
318
#if !defined (__SUN__) && !defined (__WAT32__) && !defined(__ADSGI__) && !defined (__MSVC32__) && !defined(linux)
318
#if !defined (__SUN__) && !defined (__WAT32__) && !defined(__ADSGI__) && !defined (_MSC_VER) && !defined(linux)
319 319
  char* pdest = (char*)dest;
320 320
  char* psource = (char*)source;
321 321
  int ii=0;
trunk/src/df1b2-separable/tpl2rem.lex (revision 1567)
4532 4532
      fprintf(ftopmain,"    gradient_structure::set_YES_SAVE_VARIABLES_VALUES();\n"
4533 4533
        "  #if defined(__GNUDOS__) || defined(DOS386) || defined(__DPMI32__) "
4534 4534
        " || \\\n"
4535
        "     defined(__MSVC32__)\n"
4535
        "     defined(_MSC_VER)\n"
4536 4536
        "      if (!arrmblsize) arrmblsize=150000;\n"
4537 4537
        "  #else\n"
4538 4538
        "      if (!arrmblsize) arrmblsize=25000;\n"
......
4556 4556
      fprintf(ftopmain,"    gradient_structure::set_YES_SAVE_VARIABLES_VALUES();\n"
4557 4557
        "  #if defined(__GNUDOS__) || defined(DOS386) || defined(__DPMI32__) "
4558 4558
        " || \\\n"
4559
        "     defined(__MSVC32__)\n"
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff