Merge branch 'release-4-6'

[alexxy/gromacs.git] / src / gromacs / legacyheaders / thread_mpi / atomic / cycles.h

diff --git a/src/gromacs/legacyheaders/thread_mpi/atomic/cycles.h b/src/gromacs/legacyheaders/thread_mpi/atomic/cycles.h
index 9d477d441ce84f968da705ea43ccb38b3c391bb2..a4c7f2787da24f60980f9f6471852e3d3f0a1325 100644 (file)
--- a/src/gromacs/legacyheaders/thread_mpi/atomic/cycles.h
+++ b/src/gromacs/legacyheaders/thread_mpi/atomic/cycles.h
@@ -7,13 +7,13 @@
 #if ((defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__PATHSCALE__)  || defined(__PGIC__)) && (defined(__i386__) || defined(__x86_64__)))
 #define TMPI_CYCLE_COUNT
 /* x86 or x86-64 with GCC inline assembly */
-typedef unsigned long long tmpi_cycles_t;
+typedef unsigned long long tMPI_Cycles_t;
 
-static __inline__ tmpi_cycles_t tmpi_cycles_read(void)
+static __inline__ tMPI_Cycles_t tMPI_Cycles_read(void)
 {
     /* x86 with GCC inline assembly - pentium TSC register */
-    tmpi_cycles_t   cycle;
-    unsigned        low, high;
+    tMPI_Cycles_t cycle;
+    unsigned      low, high;
 
 #ifdef HAVE_RDTSCP
     __asm__ __volatile__("rdtscp" : "=a" (low), "=d" (high) :: "ecx" );
@@ -27,26 +27,26 @@ static __inline__ tmpi_cycles_t tmpi_cycles_read(void)
 }
 #elif (defined(__INTEL_COMPILER) && defined(__ia64__))
 #define TMPI_CYCLE_COUNT
-typedef unsigned long tmpi_cycles_t;
-static __inline__ tmpi_cycles_t tmpi_cycles_read(void)
+typedef unsigned long tMPI_Cycles_t;
+static __inline__ tMPI_Cycles_t tMPI_Cycles_read(void)
 {
     /* Intel compiler on ia64 */
     return __getReg(_IA64_REG_AR_ITC);
 }
 #elif defined(__GNUC__) && defined(__ia64__)
 #define TMPI_CYCLE_COUNT
-typedef unsigned long tmpi_cycles_t;
-static __inline__ tmpi_cycles_t tmpi_cycles_read(void)
+typedef unsigned long tMPI_Cycles_t;
+static __inline__ tMPI_Cycles_t tMPI_Cycles_read(void)
 {
     /* ia64 with GCC inline assembly */
-    tmpi_cycles_t ret;
+    tMPI_Cycles_t ret;
     __asm__ __volatile__ ("mov %0=ar.itc" : "=r" (ret));
     return ret;
 }
 #elif defined(_MSC_VER)
 #define TMPI_CYCLE_COUNT
-typedef __int64 tmpi_cycles_t;
-static __inline tmpi_cycles_t tmpi_cycles_read(void)
+typedef __int64 tMPI_Cycles_t;
+static __inline tMPI_Cycles_t tMPI_Cycles_read(void)
 {
 #ifdef HAVE_RDTSCP
     unsigned int ui;