made #defines consistent: FAHCORE -> GMX_FAHCORE

diff --git a/src/gmxlib/checkpoint.c b/src/gmxlib/checkpoint.c
index 58e77aa30cb95650b93475383aaffdf98a1ce92e..0d2e30560b2579f80ec663bf2dec288c1f3cafe3 100644 (file)
--- a/src/gmxlib/checkpoint.c
+++ b/src/gmxlib/checkpoint.c
@@ -1174,7 +1174,7 @@ void write_checkpoint(const char *fn,FILE *fplog,t_commrec *cr,
     if ( fcCheckPointParallel( cr->nodeid, NULL,0) == 0 ) {
         gmx_fatal( 3,__FILE__,__LINE__, "Checkpoint error on step %d\n", step );
     }
-#endif /* end FAHCORE block */
+#endif /* end GMX_FAHCORE block */
 
 }
 
@@ -1549,7 +1549,7 @@ static void read_checkpoint(const char *fn,FILE **pfplog,
                     " offsets. Can not append. Run mdrun without -append",
                     outputfiles[i].filename);
             }
-#ifdef FAHCORE
+#ifdef GMX_FAHCORE
             chksum_file=gmx_fio_open(outputfiles[i].filename,"a");
 
 #else
@@ -1596,7 +1596,7 @@ static void read_checkpoint(const char *fn,FILE **pfplog,
             {
                 gmx_fio_close(chksum_file);
             }
-#ifndef FAHCORE            
+#ifndef GMX_FAHCORE            
             /* compare md5 chksum */
             if (outputfiles[i].chksum_size != -1 &&
                 memcmp(digest,outputfiles[i].chksum,16)!=0) 

diff --git a/src/gmxlib/gmxfio.c b/src/gmxlib/gmxfio.c
index 6791ede8b3098a8bab4160d2b498fc418c9541ad..56fd5a594450b68f3fd3712dcc9dcfed6553f148 100644 (file)
--- a/src/gmxlib/gmxfio.c
+++ b/src/gmxlib/gmxfio.c
@@ -1523,7 +1523,7 @@ static int gmx_fio_fsync_lock(int fio, bool do_lock)
 {
     int rc = 0;
 
-#if (defined(HAVE_FILENO) && defined(HAVE_FSYNC)) && !defined(FAHCORE) 
+#if (defined(HAVE_FILENO) && defined(HAVE_FSYNC)) && !defined(GMX_FAHCORE) 
 #ifdef GMX_THREADS
     if (do_lock)
         tMPI_Thread_mutex_lock(&fio_mutex);