X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Fgmxlib%2Fmain.cpp;h=deea126674bb394a24a63eb457d5f125ac782925;hb=d191fe153c29168087ae76c7d672d7fcf217fbad;hp=9a3078310dfad84821c6d5c76fc25737b80e5b87;hpb=fdbd674832f07e7388761a004321edd1089e8d39;p=alexxy%2Fgromacs.git diff --git a/src/gromacs/gmxlib/main.cpp b/src/gromacs/gmxlib/main.cpp index 9a3078310d..deea126674 100644 --- a/src/gromacs/gmxlib/main.cpp +++ b/src/gromacs/gmxlib/main.cpp @@ -46,16 +46,6 @@ #include #include -#ifdef GMX_NATIVE_WINDOWS -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include -#endif - #include "gromacs/fileio/filenm.h" #include "gromacs/fileio/gmxfio.h" #include "gromacs/legacyheaders/copyrite.h" @@ -70,6 +60,7 @@ #include "gromacs/utility/gmxmpi.h" #include "gromacs/utility/programcontext.h" #include "gromacs/utility/smalloc.h" +#include "gromacs/utility/sysinfo.h" /* The source code in this file should be thread-safe. Please keep it that way. */ @@ -243,15 +234,7 @@ void gmx_log_open(const char *lognm, const t_commrec *cr, time(&t); -#ifndef NO_GETPID -# ifdef GMX_NATIVE_WINDOWS - pid = _getpid(); -# else - pid = getpid(); -# endif -#else - pid = 0; -#endif + pid = gmx_getpid(); if (bAppendFiles) {