From: N. Brouard <brouard@ined.fr>
Date: Sat, 3 Jan 2015 16:45:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: imach-099s7~386
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=8c22a117ac367c6398205cfca899c38633c492a0;p=.git

*** empty log message ***
---

diff --git a/src/imach.c b/src/imach.c
index 2bdc0f9..a03c43a 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.175  2015/01/03 16:33:42  brouard
+  *** empty log message ***
+
   Revision 1.174  2015/01/03 16:15:49  brouard
   Summary: Still in cross-compilation
 
@@ -5503,6 +5506,7 @@ void syscompilerinfo()
    /* #include "syscompilerinfo.h"*/
 #if defined(__GNUC__) 
 #include <gnu/libc-version.h>  /* Only on gnu */
+struct utsname sysInfo;
 #endif
 
 #include <stdint.h>
@@ -5571,15 +5575,6 @@ void syscompilerinfo()
    printf(" wtf-bit"); fprintf(ficlog," wtf-bit");/* wtf */
 #endif
 
-/* struct utsname sysInfo;
-
-   if (uname(&sysInfo) != -1) {
-     printf(" %s %s %s %s %s\n",sysInfo.sysname, sysInfo.nodename, sysInfo.release, sysInfo.version, sysInfo.machine);
-     fprintf(ficlog," %s %s %s %s %s\n ",sysInfo.sysname, sysInfo.nodename, sysInfo.release, sysInfo.version, sysInfo.machine);
-   }
-   else
-      perror("uname() error");
-	  */
 #if defined(__GNUC__)
 # if defined(__GNUC_PATCHLEVEL__)
 #  define __GNUC_VERSION__ (__GNUC__ * 10000 \
@@ -5591,6 +5586,13 @@ void syscompilerinfo()
 # endif
    printf(" using GNU C version %d.\n", __GNUC_VERSION__);
    fprintf(ficlog, " using GNU C version %d.\n", __GNUC_VERSION__);
+
+   if (uname(&sysInfo) != -1) {
+     printf("Running on: %s %s %s %s %s\n",sysInfo.sysname, sysInfo.nodename, sysInfo.release, sysInfo.version, sysInfo.machine);
+     fprintf(ficlog,"Running on: %s %s %s %s %s\n ",sysInfo.sysname, sysInfo.nodename, sysInfo.release, sysInfo.version, sysInfo.machine);
+   }
+   else
+      perror("uname() error");
    printf("GNU libc version: %s\n", gnu_get_libc_version()); 
    fprintf(ficlog,"GNU libc version: %s\n", gnu_get_libc_version()); 
 
@@ -5600,12 +5602,12 @@ void syscompilerinfo()
    //   {
 #if defined(_MSC_VER)
    if (IsWow64()){
-	   printf("The program (probably compile for 32bit) is running under WOW64 (64bit) emulation.\n");
-	   fprintf(ficlog, "The program (ie 32bit) is running under WOW64 (64bit) emulation.\n");
+	   printf("The program (probably compiled for 32bit) is running under WOW64 (64bit) emulation.\n");
+	   fprintf(ficlog, "The program (probably compiled for 32bit) is running under WOW64 (64bit) emulation.\n");
    }
    else{
-	   printf("The process is not running under WOW64 (i.e probably on a 64bits windows).\n");
-	   frintf(ficlog,"The programm is not running under WOW64 (i.e probably on a 64bits windows).\n");
+	   printf("The process is not running under WOW64 (i.e probably on a 64bit Windows).\n");
+	   frintf(ficlog,"The programm is not running under WOW64 (i.e probably on a 64bit Windows).\n");
    }
    //	   printf("\nPress Enter to continue...");
    //	   getchar();