--- imach/src/imach.c	2014/12/23 11:17:12	1.170
+++ imach/src/imach.c	2015/01/03 12:06:26	1.173
@@ -1,6 +1,17 @@
-/* $Id: imach.c,v 1.170 2014/12/23 11:17:12 brouard Exp $
+/* $Id: imach.c,v 1.173 2015/01/03 12:06:26 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.173  2015/01/03 12:06:26  brouard
+  Summary: trying to detect cross-compilation
+
+  Revision 1.172  2014/12/27 12:07:47  brouard
+  Summary: Back from Visual Studio and Intel, options for compiling for Windows XP
+
+  Revision 1.171  2014/12/23 13:26:59  brouard
+  Summary: Back from Visual C
+
+  Still problem with utsname.h on Windows
+
   Revision 1.170  2014/12/23 11:17:12  brouard
   Summary: Cleaning some \%% back to %%
 
@@ -532,13 +543,19 @@
 
 #ifdef _WIN32
 #include <io.h>
+#include <windows.h>
+#include <tchar.h>
 #else
 #include <unistd.h>
 #endif
 
 #include <limits.h>
 #include <sys/types.h>
-#include <sys/utsname.h>
+
+#if defined(__GNUC__)
+#include <sys/utsname.h> /* Doesn't work on Windows */
+#endif
+
 #include <sys/stat.h>
 #include <errno.h>
 /* extern int errno; */
@@ -600,11 +617,11 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.170 2014/12/23 11:17:12 brouard Exp $ */
+/* $Id: imach.c,v 1.173 2015/01/03 12:06:26 brouard Exp $ */
 /* $State: Exp $ */
 
 char version[]="Imach version 0.98p, December 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015";
-char fullversion[]="$Revision: 1.170 $ $Date: 2014/12/23 11:17:12 $"; 
+char fullversion[]="$Revision: 1.173 $ $Date: 2015/01/03 12:06:26 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -5442,11 +5459,47 @@ int calandcheckages(int imx, int maxwav,
     return (1);
 }
 
+#if defined(_MSC_VER)
+/*printf("Visual C++ compiler: %s \n;", _MSC_FULL_VER);*/
+/*fprintf(ficlog, "Visual C++ compiler: %s \n;", _MSC_FULL_VER);*/
+//#include "stdafx.h"
+//#include <stdio.h>
+//#include <tchar.h>
+//#include <windows.h>
+//#include <iostream>
+typedef BOOL(WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
+
+LPFN_ISWOW64PROCESS fnIsWow64Process;
+
+BOOL IsWow64()
+{
+	BOOL bIsWow64 = FALSE;
+
+	//typedef BOOL (APIENTRY *LPFN_ISWOW64PROCESS)
+	//  (HANDLE, PBOOL);
+
+	//LPFN_ISWOW64PROCESS fnIsWow64Process;
+
+	HMODULE module = GetModuleHandle(_T("kernel32"));
+	const char funcName[] = "IsWow64Process";
+	fnIsWow64Process = (LPFN_ISWOW64PROCESS)
+		GetProcAddress(module, funcName);
+
+	if (NULL != fnIsWow64Process)
+	{
+		if (!fnIsWow64Process(GetCurrentProcess(),
+			&bIsWow64))
+			//throw std::exception("Unknown error");
+			printf("Unknown error\n");
+	}
+	return bIsWow64 != FALSE;
+}
+#endif
 void syscompilerinfo()
  {
    /* #include "syscompilerinfo.h"*/
    /* #include <gnu/libc-version.h> */ /* Only on gnu */
-
+#include <stdint.h>
    printf("Compiled with:");fprintf(ficlog,"Compiled with:");
 #if defined(__clang__)
    printf(" Clang/LLVM");fprintf(ficlog," Clang/LLVM");	/* Clang/LLVM. ---------------------------------------------- */
@@ -5477,12 +5530,16 @@ void syscompilerinfo()
 // http://stackoverflow.com/questions/4605842/how-to-identify-platform-compiler-from-preprocessor-macros
 #ifdef _WIN32 // note the underscore: without it, it's not msdn official!
     // Windows (x64 and x86)
+   printf("Windows (x64 and x86). ");fprintf(ficlog,"Windows (x64 and x86). ");
 #elif __unix__ // all unices, not all compilers
     // Unix
+   printf("Unix. ");fprintf(ficlog,"Unix. ");
 #elif __linux__
     // linux
+   printf("linux. ");fprintf(ficlog,"linux. ");
 #elif __APPLE__
     // Mac OS, not sure if this is covered by __posix__ and/or __unix__ though...
+   printf("Mac OS. ");fprintf(ficlog,"Mac OS. ");
 #endif
 
 /*  __MINGW32__	  */
@@ -5494,16 +5551,16 @@ void syscompilerinfo()
 /* _WIN64  // Defined for applications for Win64. */
 /* _M_X64 // Defined for compilations that target x64 processors. */
 /* _DEBUG // Defined when you compile with /LDd, /MDd, and /MTd. */
-#include <stdint.h>
+
 #if UINTPTR_MAX == 0xffffffff
-   printf(" 32-bit."); /* 32-bit */
+   printf(" 32-bit.\n"); fprintf(ficlog," 32-bit.\n");/* 32-bit */
 #elif UINTPTR_MAX == 0xffffffffffffffff
-  printf(" 64-bit.");/* 64-bit */
+   printf(" 64-bit.\n"); fprintf(ficlog," 64-bit.\n");/* 64-bit */
 #else
- printf(" wtf-bit."); /* wtf */
+   printf(" wtf-bit.\n"); fprintf(ficlog," wtf-bit.\n");/* wtf */
 #endif
 
-struct utsname sysInfo;
+/* struct utsname sysInfo;
 
    if (uname(&sysInfo) != -1) {
      printf(" %s %s %s %s %s\n",sysInfo.sysname, sysInfo.nodename, sysInfo.release, sysInfo.version, sysInfo.machine);
@@ -5511,6 +5568,7 @@ struct utsname sysInfo;
    }
    else
       perror("uname() error");
+	  */
 #if defined(__GNUC__)
 # if defined(__GNUC_PATCHLEVEL__)
 #  define __GNUC_VERSION__ (__GNUC__ * 10000 \
@@ -5523,9 +5581,19 @@ struct utsname sysInfo;
    printf("GNU C version %d.\n", __GNUC_VERSION__);
    fprintf(ficlog, "GNU C version %d.\n", __GNUC_VERSION__);
 #endif
+
+   //   void main()
+   //   {
 #if defined(_MSC_VER)
-   printf("Visual C++ compiler: %s \n;", _MSC_FULL_VER);
-   fprintf(ficlog, "Visual C++ compiler: %s \n;", _MSC_FULL_VER);
+   if (IsWow64())
+	   printf("The process is running under WOW64.\n");
+   else
+	   printf("The process is not running under WOW64.\n");
+
+   //	   printf("\nPress Enter to continue...");
+   //	   getchar();
+   //   }
+
 #endif
    
   /* printf("GNU libc version: %s\n", gnu_get_libc_version()); */