--- imach/src/imach.c 2014/12/23 11:17:12 1.170 +++ imach/src/imach.c 2014/12/23 13:26:59 1.171 @@ -1,6 +1,11 @@ -/* $Id: imach.c,v 1.170 2014/12/23 11:17:12 brouard Exp $ +/* $Id: imach.c,v 1.171 2014/12/23 13:26:59 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + 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 %% @@ -538,7 +543,11 @@ #include #include -#include + +#if defined(__GNUC__) +#include /* Doesn't work on Windows */ +#endif + #include #include /* extern int errno; */ @@ -600,11 +609,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.171 2014/12/23 13:26:59 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.171 $ $Date: 2014/12/23 13:26:59 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -5446,7 +5455,7 @@ void syscompilerinfo() { /* #include "syscompilerinfo.h"*/ /* #include */ /* Only on gnu */ - +#include printf("Compiled with:");fprintf(ficlog,"Compiled with:"); #if defined(__clang__) printf(" Clang/LLVM");fprintf(ficlog," Clang/LLVM"); /* Clang/LLVM. ---------------------------------------------- */ @@ -5494,16 +5503,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 + #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 +5520,7 @@ struct utsname sysInfo; } else perror("uname() error"); + */ #if defined(__GNUC__) # if defined(__GNUC_PATCHLEVEL__) # define __GNUC_VERSION__ (__GNUC__ * 10000 \ @@ -5524,8 +5534,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()); */