diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-02-28 17:38:28 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-02-28 17:38:28 +0000 |
| commit | 0dff587c9dd7ac0b02fc93f58883e24cd2d4e92e (patch) | |
| tree | d8e467082d6db3073d3a822d78d0628dc82a92e4 /src/io/sys.cpp | |
| parent | Pen context, paraxial mode: don't add a L-shaped path to close the shape when... (diff) | |
| download | inkscape-0dff587c9dd7ac0b02fc93f58883e24cd2d4e92e.tar.gz inkscape-0dff587c9dd7ac0b02fc93f58883e24cd2d4e92e.zip | |
Compilation fixes for Windows 64-bit by Fridrich
(bzr r9118)
Diffstat (limited to 'src/io/sys.cpp')
| -rw-r--r-- | src/io/sys.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/io/sys.cpp b/src/io/sys.cpp index 2841f0af8..f25575c9c 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -36,9 +36,11 @@ #include <process.h> // declares spawn functions #include <wchar.h> // declares _wspawn functions -#ifdef __cplusplus + +#ifndef __MINGW32__ +# ifdef __cplusplus extern "C" { -#endif +# endif _CRTIMP int __cdecl __MINGW_NOTHROW _wspawnl (int, const wchar_t*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW _wspawnle (int, const wchar_t*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW _wspawnlp (int, const wchar_t*, const wchar_t*, ...); @@ -47,8 +49,9 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _wspawnv (int, const wchar_t*, const wchar_t _CRTIMP int __cdecl __MINGW_NOTHROW _wspawnve (int, const wchar_t*, const wchar_t* const*, const wchar_t* const*); _CRTIMP int __cdecl __MINGW_NOTHROW _wspawnvp (int, const wchar_t*, const wchar_t* const*); _CRTIMP int __cdecl __MINGW_NOTHROW _wspawnvpe (int, const wchar_t*, const wchar_t* const*, const wchar_t* const*); -#ifdef __cplusplus +# ifdef __cplusplus } +# endif #endif #include <unistd.h> #include <glibmm/i18n.h> @@ -409,7 +412,7 @@ dup_noninherited (int fd, GetCurrentProcess (), &filehandle, 0, FALSE, DUPLICATE_SAME_ACCESS); close (fd); - return _open_osfhandle ((long) filehandle, mode | _O_NOINHERIT); + return _open_osfhandle ((LONG_PTR) filehandle, mode | _O_NOINHERIT); } |