* Shouldn't have a timer header for sync_builtin, since it doesn't actually

have timer support
* Default timer size should be a long, not an int.  Int will roll over way
  too fast, with no performance benifit on 64 bit machines...

This commit was SVN r25501.

opal/include/opal/sys/sync_builtin/Makefile.am

@@ -20,5 +20,4 @@
 # This makefile.am does not stand on its own - it is included from opal/include/Makefile.am
 
 headers += \
-	opal/sys/sync_builtin/atomic.h \
+	opal/sys/sync_builtin/atomic.h
-	opal/sys/sync_builtin/timer.h

opal/include/opal/sys/sync_builtin/timer.h

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
- * $COPYRIGHT$
- * 
- * Additional copyrights may follow
- * 
- * $HEADER$
- */
-
-#ifndef OMPI_SYS_ARCH_TIMER_H
-#define OMPI_SYS_ARCH_TIMER_H 1
-
-typedef long opal_timer_t;
-
-#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
-
-#endif /* ! OMPI_SYS_ARCH_TIMER_H */

opal/include/opal/sys/timer.h

@@ -103,7 +103,7 @@ BEGIN_C_DECLS
 #ifndef OPAL_HAVE_SYS_TIMER_GET_CYCLES
 #define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
 
-typedef int opal_timer_t;
+typedef long opal_timer_t;
 #endif
 #endif