gnucash-on-windows master: Bug 793461 - Transaction matcher window blank when importing QFX

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/6e36fbf4 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/dbb9f9a8 (commit)



commit 6e36fbf4f13e614c121ec40fa1217eb3afc049e5
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Apr 27 16:21:43 2018 -0700

    Bug 793461 - Transaction matcher window blank when importing QFX
    
    Use compiler-defined __WIN32__ instead of not-defined OS_WIN32.

diff --git a/patches/libofx-tempfile.patch b/patches/libofx-tempfile.patch
index c67198b..624c92d 100644
--- a/patches/libofx-tempfile.patch
+++ b/patches/libofx-tempfile.patch
@@ -6,7 +6,7 @@
      mkTempFileName("libofxtmpXXXXXX", tmp_filename, sizeof(tmp_filename));
  
      message_out(DEBUG, "ofx_proc_file(): Creating temp file: " + string(tmp_filename));
-+#ifdef OS_WIN32
++#ifdef __WIN32__
 +    tmp_file_fd = mkstemp_win32(tmp_filename);
 +#else
      tmp_file_fd = mkstemp(tmp_filename);
@@ -22,7 +22,7 @@
              size_t outbytesleft = inbytesleft * 2 - 1;
              iconv_buffer = (char*) malloc (inbytesleft * 2);
              memset(iconv_buffer, 0, inbytesleft * 2);
--#if defined(OS_WIN32) || defined(__sun)
+-#if defined(__WIN32__) || defined(__sun)
 +#if defined(__sun)
              const char * inchar = (const char *)s_buffer.c_str();
  #else
@@ -35,7 +35,7 @@
  
  
  
- #ifdef OS_WIN32
+ #ifdef __WIN32__
  
 -int mkstemp(char *tmpl)
 +int mkstemp_win32(char *tmpl)
@@ -50,7 +50,7 @@
  #endif
  
  
- #ifdef OS_WIN32
+ #ifdef __WIN32__
  
 -int mkstemp(char *tmpl);
 +int mkstemp_win32(char *tmpl);



Summary of changes:
 patches/libofx-tempfile.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)