From: N. Brouard <brouard@ined.fr>
Date: Tue, 23 Dec 2014 13:26:59 +0000 (+0000)
Subject: Summary: Back from Visual C
X-Git-Tag: imach-099s7~392
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=6fb67a83043b915fe21acbe1073653607183e5e6;p=.git

Summary: Back from Visual C

Still problem with utsname.h on Windows
---

diff --git a/src/imach.c b/src/imach.c
index eddf50d..6be7e79 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,11 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.170  2014/12/23 11:17:12  brouard
+  Summary: Cleaning some \%% back to %%
+
+  The escape was mandatory for a specific compiler (which one?), but too many warnings.
+
   Revision 1.169  2014/12/22 23:08:31  brouard
   Summary: 0.98p
 
@@ -533,7 +538,11 @@
 
 #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; */
@@ -5441,7 +5450,7 @@ 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. ---------------------------------------------- */
@@ -5489,16 +5498,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);
@@ -5506,6 +5515,7 @@ struct utsname sysInfo;
    }
    else
       perror("uname() error");
+	  */
 #if defined(__GNUC__)
 # if defined(__GNUC_PATCHLEVEL__)
 #  define __GNUC_VERSION__ (__GNUC__ * 10000 \
@@ -5519,8 +5529,8 @@ struct utsname sysInfo;
    fprintf(ficlog, "GNU C version %d.\n", __GNUC_VERSION__);
 #endif
 #if defined(_MSC_VER)
-   printf("Visual C++ compiler: %s \n;", _MSC_FULL_VER);
-   fprintf(ficlog, "Visual C++ compiler: %s \n;", _MSC_FULL_VER);
+   /*printf("Visual C++ compiler: %s \n;", _MSC_FULL_VER);*/
+   /*fprintf(ficlog, "Visual C++ compiler: %s \n;", _MSC_FULL_VER);*/
 #endif
    
   /* printf("GNU libc version: %s\n", gnu_get_libc_version()); */