From b7d10b3499f234798d58498eeeb22076e47bb927 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 5 Feb 2014 12:24:02 +0000 Subject: [PATCH] Remove some unused AC_DEFINE's, and also remove a redundant AC_DEFINE This commit was SVN r30564. --- configure.ac | 6 ------ oshmem/shmem/c/shmem_lock.c | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 71a4121151..950f961410 100644 --- a/configure.ac +++ b/configure.ac @@ -937,12 +937,6 @@ AC_DEFINE_UNQUOTED(OMPI_MPI_OFFSET_TYPE, $MPI_OFFSET_TYPE, [Type of MPI_Offset - AC_DEFINE_UNQUOTED(OMPI_MPI_OFFSET_SIZE, $MPI_OFFSET_SIZE, [Size of the MPI_Offset]) AC_DEFINE_UNQUOTED(OMPI_OFFSET_DATATYPE, $MPI_OFFSET_DATATYPE, [MPI datatype corresponding to MPI_Offset]) -AC_DEFINE_UNQUOTED(OSHMEM_SHMEM_OFFSET_TYPE, $MPI_OFFSET_TYPE, [Type of OSHMEM_Offset -- has to be defined here and typedef'ed later because shmem.h does not get AC SUBST's]) -AC_DEFINE_UNQUOTED(OSHMEM_SHMEM_OFFSET_SIZE, $MPI_OFFSET_SIZE, [Size of the OSHMEM_Offset]) -AC_DEFINE_UNQUOTED(OSHMEM_OFFSET_DATATYPE, $MPI_OFFSET_DATATYPE, [OSHMEM datatype corresponding to SHMEM_Offset]) - -AC_DEFINE_UNQUOTED(OPAL_SIZEOF_LONG, $ac_cv_sizeof_long, "Size of 'long' type") - if test $MPI_COUNT_SIZE -eq 8 ; then MPI_COUNT_MAX="0x7fffffffffffffffll" elif test $MPI_COUNT_SIZE -eq 4 ; then diff --git a/oshmem/shmem/c/shmem_lock.c b/oshmem/shmem/c/shmem_lock.c index f30c4c1473..8b41a31a49 100644 --- a/oshmem/shmem/c/shmem_lock.c +++ b/oshmem/shmem/c/shmem_lock.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -24,7 +25,7 @@ #include "oshmem/mca/memheap/memheap.h" #include "oshmem/mca/atomic/atomic.h" -#define OPAL_BITWISE_SIZEOF_LONG (OPAL_SIZEOF_LONG*8) +#define OPAL_BITWISE_SIZEOF_LONG (SIZEOF_LONG * 8) struct oshmem_lock_counter { void *lock;