removed HYPREDEFS, added top level dir to -I in makefile, included HYPRE_config.h in various .c and .h files, restructured some other #includes

utilities/HYPRE_utilities.h

@@ -15,6 +15,8 @@
 #ifndef HYPRE_UTILITIES_HEADER
 #define HYPRE_UTILITIES_HEADER
 
+#include <HYPRE_config.h>
+
 #ifndef HYPRE_SEQUENTIAL
 #include "mpi.h"
 #endif

utilities/Makefile.in

@@ -19,9 +19,10 @@ C_COMPILE_FLAGS=@CFLAGS@
 CXX_COMPILE_FLAGS=@CXXFLAGS@
 F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
-CDEFS = @HYPREDEFS@ @TIMERDEFS@ -DHYPRE_TIMING
+CDEFS = @TIMERDEFS@ -DHYPRE_TIMING
 
 CFLAGS =\
+   -I..\
    ${C_COMPILE_FLAGS}\
    ${CINCLUDES}\
    ${CDEFS}

utilities/headers

@@ -16,6 +16,8 @@ INTERNAL_HEADER=utilities.h
 
 cat > $INTERNAL_HEADER <<@
 
+#include <HYPRE_config.h>
+
 #include "HYPRE_utilities.h"
 
 #ifndef hypre_UTILITIES_HEADER

utilities/memory.c

@@ -12,9 +12,9 @@
  * Memory management utilities
  *
  *****************************************************************************/
-
+#include <stdlib.h>
-#include "memory.h"
 #include <stdio.h>
+#include "utilities.h"
 
 #ifdef HYPRE_USE_PTHREADS
 #include "threading.h"

utilities/memory.h

@@ -15,9 +15,6 @@
 #ifndef hypre_MEMORY_HEADER
 #define hypre_MEMORY_HEADER
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

utilities/mpistubs.c

@@ -12,10 +12,10 @@
  *
  *****************************************************************************/
 
-#ifdef HYPRE_SEQUENTIAL
-
 #include "utilities.h"
 
+#ifdef HYPRE_SEQUENTIAL
+
 int
 MPI_Init( int    *argc,
           char ***argv)

utilities/thread_mpistubs.c

@@ -12,12 +12,11 @@
  *
  *****************************************************************************/
 
+#include "utilities.h"
+
 #ifdef HYPRE_USE_PTHREADS
 
-#define HYPRE_USING_THREAD_MPISTUBS 
+#define HYPRE_USING_THREAD_MPISTUBS
-
-#include "utilities.h"
-#include <mpi.h>
 
 int
 hypre_thread_MPI_Init( int    *argc,

utilities/thread_mpistubs.h

@@ -17,8 +17,6 @@
 
 #ifdef HYPRE_USE_PTHREADS
 
-#include "mpi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

utilities/threading.c

@@ -6,14 +6,14 @@
 *********************************************************************EHEADER*/
 
 #define HYPRE_THREAD_GLOBALS
-#ifdef HYPRE_USE_PTHREADS
 
 #include <malloc.h>
 #include <assert.h>
 #include <stdio.h>
 #include <signal.h>
-#include "mpi.h"
+#include "utilities.h"
-#include "threading.h"
+
+#ifdef HYPRE_USE_PTHREADS
 
 #ifdef HYPRE_USE_UMALLOC
 #include "umalloc_local.h"

utilities/threading.h

@@ -23,8 +23,7 @@
 #define MAX_QUEUE 256
 #endif
 
-#include<pthread.h>
+#include <pthread.h>
-#include "utilities.h"
 
 /* hypre_work_proc_t typedef'd to be a pointer to a function with a void*
    argument and a void return type */

utilities/utilities.h

@@ -1,4 +1,6 @@
 
+#include <HYPRE_config.h>
+
 #include "HYPRE_utilities.h"
 
 #ifndef hypre_UTILITIES_HEADER
@@ -221,9 +223,6 @@ int MPI_Type_commit P((MPI_Datatype *datatype ));
 #ifndef hypre_MEMORY_HEADER
 #define hypre_MEMORY_HEADER
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -359,8 +358,6 @@ double hypre_Rand P((void ));
 
 #ifdef HYPRE_USE_PTHREADS
 
-#include "mpi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -463,8 +460,7 @@ int hypre_thread_MPI_Type_commit P((MPI_Datatype *datatype ));
 #define MAX_QUEUE 256
 #endif
 
-#include<pthread.h>
+#include <pthread.h>
-#include "utilities.h"
 
 /* hypre_work_proc_t typedef'd to be a pointer to a function with a void*
    argument and a void return type */