octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

MSCV compilation patch: toascii


From: Michael Goffioul
Subject: MSCV compilation patch: toascii
Date: Sat, 28 Oct 2006 11:38:53 +0200
User-agent: Thunderbird 1.5.0.7 (Windows/20060909)

This patch undefine toascii. Under MSVC, toascii is a macro that expands to __toascii; hence the function defined in octave is __toascii and not toascii. Undefining toascii solves
the problem.

Michael.

Index: src/mappers.cc
===================================================================
RCS file: /cvs/octave/src/mappers.cc,v
retrieving revision 1.87
diff -c -r1.87 mappers.cc
*** src/mappers.cc      24 Apr 2006 19:13:08 -0000      1.87
--- src/mappers.cc      28 Oct 2006 09:14:56 -0000
***************
*** 610,615 ****
--- 610,619 ----
  Compute hyperbolic tangent of each element of @var{x}.\n\
  @end deftypefn");
  
+ #if defined(_MSC_VER) && defined(toascii)
+ #undef toascii
+ #endif
+ 
    DEFUN_MAPPER (toascii, xtoascii, 0, 0, 0, 0, 0, 0.0, 0.0, 1, 0,
      "-*- texinfo -*-\n\
  @deftypefn {Mapping Function} {} toascii (@var{s})\n\

reply via email to

[Prev in Thread] Current Thread [Next in Thread]