--- imach/src/imach.c 2015/01/03 18:40:56 1.177 +++ imach/src/imach.c 2015/01/04 09:57:06 1.179 @@ -1,6 +1,12 @@ -/* $Id: imach.c,v 1.177 2015/01/03 18:40:56 brouard Exp $ +/* $Id: imach.c,v 1.179 2015/01/04 09:57:06 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.179 2015/01/04 09:57:06 brouard + Summary: back to OS/X + + Revision 1.178 2015/01/04 09:35:48 brouard + *** empty log message *** + Revision 1.177 2015/01/03 18:40:56 brouard Summary: Still testing ilc32 on OSX @@ -629,11 +635,11 @@ typedef struct { #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.177 2015/01/03 18:40:56 brouard Exp $ */ +/* $Id: imach.c,v 1.179 2015/01/04 09:57:06 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.177 $ $Date: 2015/01/03 18:40:56 $"; +char fullversion[]="$Revision: 1.179 $ $Date: 2015/01/04 09:57:06 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -5513,18 +5519,23 @@ void syscompilerinfo() /* #include "syscompilerinfo.h"*/ #if defined __INTEL_COMPILER - struct utsname sysInfo; +#if defined(__GNUC__) + struct utsname sysInfo; /* For Intel on Linux and OS/X */ +#endif #elif defined(__GNUC__) +#ifndef __APPLE__ #include /* Only on gnu */ - struct utsname sysInfo; #endif - -#include + struct utsname sysInfo; int cross = CROSS; if (cross){ - printf("Cross-"); - fprintf(ficlog,"Cross-"); + printf("Cross-"); + fprintf(ficlog, "Cross-"); } +#endif + +#include + printf("Compiled with:");fprintf(ficlog,"Compiled with:"); #if defined(__clang__) printf(" Clang/LLVM");fprintf(ficlog," Clang/LLVM"); /* Clang/LLVM. ---------------------------------------------- */ @@ -5603,9 +5614,10 @@ void syscompilerinfo() } else perror("uname() error"); -#ifndef __INTEL_COMPILER + //#ifndef __INTEL_COMPILER +#if !defined (__INTEL_COMPILER) && !defined(__APPLE__) printf("GNU libc version: %s\n", gnu_get_libc_version()); - fprintf(ficlog,"GNU libc version: %s\n", gnu_get_libc_version()); + fprintf(ficlog,"GNU libc version: %s\n", gnu_get_libc_version()); #endif #endif @@ -5618,7 +5630,7 @@ void syscompilerinfo() } else{ 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"); + fprintf(ficlog,"The programm is not running under WOW64 (i.e probably on a 64bit Windows).\n"); } // printf("\nPress Enter to continue..."); // getchar();