[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.166 and 1.168

version 1.166, 2014/12/22 11:40:47 version 1.168, 2014/12/22 15:17:42
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.168  2014/12/22 15:17:42  brouard
     Summary: udate
   
     Revision 1.167  2014/12/22 13:50:56  brouard
     Summary: Testing uname and compiler version and if compiled 32 or 64
   
     Testing on Linux 64
   
   Revision 1.166  2014/12/22 11:40:47  brouard    Revision 1.166  2014/12/22 11:40:47  brouard
   *** empty log message ***    *** empty log message ***
   
Line 520 Line 528
   
 #include <limits.h>  #include <limits.h>
 #include <sys/types.h>  #include <sys/types.h>
   #include <sys/utsname.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <errno.h>  #include <errno.h>
 /* extern int errno; */  /* extern int errno; */
Line 538 Line 547
 #include <gsl/gsl_multimin.h>  #include <gsl/gsl_multimin.h>
 #endif  #endif
   
   
 #ifdef NLOPT  #ifdef NLOPT
 #include <nlopt.h>  #include <nlopt.h>
 typedef struct {  typedef struct {
Line 583  typedef struct { Line 593  typedef struct {
 /* $Id$ */  /* $Id$ */
 /* $State$ */  /* $State$ */
   
 char version[]="Imach version 0.99, September 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";  char version[]="Imach version 0.98nY, 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$ $Date$";   char fullversion[]="$Revision$ $Date$"; 
 char strstart[80];  char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];  char optionfilext[10], optionfilefiname[FILENAMELENGTH];
Line 5418  calandcheckages(int imx, int maxwav, dou Line 5428  calandcheckages(int imx, int maxwav, dou
     return (1);      return (1);
 }  }
   
   syscompilerinfo()
    {
      /* #include "syscompilerinfo.h"*/
   #include <gnu/libc-version.h>
   #if defined(__GNUC__)
   # if defined(__GNUC_PATCHLEVEL__)
   #  define __GNUC_VERSION__ (__GNUC__ * 10000 \
                               + __GNUC_MINOR__ * 100 \
                               + __GNUC_PATCHLEVEL__)
   # else
   #  define __GNUC_VERSION__ (__GNUC__ * 10000 \
                               + __GNUC_MINOR__ * 100)
   # endif
   #endif
   
   // 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)
   #elif __unix__ // all unices, not all compilers
       // Unix
   #elif __linux__
       // linux
   #elif __APPLE__
       // Mac OS, not sure if this is covered by __posix__ and/or __unix__ though...
   #endif
   
   /*  __MINGW32__   */
   /*  __CYGWIN__   */
   /* __MINGW64__  */
   // http://msdn.microsoft.com/en-us/library/b0084kay.aspx
   /* _MSC_VER  //the Visual C++ compiler is 17.00.51106.1, the _MSC_VER macro evaluates to 1700. Type cl /?  */
   /* _MSC_FULL_VER //the Visual C++ compiler is 15.00.20706.01, the _MSC_FULL_VER macro evaluates to 150020706 */
   /* _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 \n"); /* 32-bit */
   #elif UINTPTR_MAX == 0xffffffffffffffff
     printf("64-bit \n");/* 64-bit */
   #else
    printf("wtf-bit \n"); /* wtf */
   #endif
   
   struct utsname sysInfo;
   
      if (uname(&sysInfo) != -1) {
         puts(sysInfo.sysname);
         puts(sysInfo.nodename);
         puts(sysInfo.release);
         puts(sysInfo.version);
         puts(sysInfo.machine);
      }
      else
         perror("uname() error");
      printf("GNU C version %d\n", __GNUC_VERSION__);
     printf("GNU libc version: %s\n", gnu_get_libc_version());
   
    }
   
 /***********************************************/  /***********************************************/
 /**************** Main Program *****************/  /**************** Main Program *****************/
Line 5595  int main(int argc, char *argv[]) Line 5664  int main(int argc, char *argv[])
  optionfilext=%s\n\   optionfilext=%s\n\
  optionfilefiname='%s'\n",pathimach,pathtot,path,optionfile,optionfilext,optionfilefiname);   optionfilefiname='%s'\n",pathimach,pathtot,path,optionfile,optionfilext,optionfilefiname);
   
     syscompilerinfo();
   
   printf("Local time (at start):%s",strstart);    printf("Local time (at start):%s",strstart);
   fprintf(ficlog,"Local time (at start): %s",strstart);    fprintf(ficlog,"Local time (at start): %s",strstart);
   fflush(ficlog);    fflush(ficlog);
Removed from v.1.166  
changed lines
  Added in v.1.168

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>