diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2016-01-22 06:57:38 -0800 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2016-01-22 06:57:38 -0800 |
| commit | 3ad9aafbd02e23c0d4a8fdb41f02ff25fa03746a (patch) | |
| tree | 22e6b43c42435750896183e896b0585ea119d7f6 /mpi | |
| parent | 278afeb72cd9dd6d150b6818211678668eb2253b (diff) | |
| download | txr-3ad9aafbd02e23c0d4a8fdb41f02ff25fa03746a.tar.gz txr-3ad9aafbd02e23c0d4a8fdb41f02ff25fa03746a.tar.bz2 txr-3ad9aafbd02e23c0d4a8fdb41f02ff25fa03746a.zip | |
Reduce header pollution caused by mpi.h.
* eval.c: include <assert.h> that was previously coming
via "mpi.h".
* mpi/mpi.c: Includes of <stdio.h>, <ctype.h> and <assert.h>
moved here.
* mpi/mpi.h: Remove include of <stdio.h>, <ctype.h> and
<assert.h>. Keeping <limits.h> for now; needed for CHAR_BIT.
* mpi/mplogic.c: Needs <assert.h>
Diffstat (limited to 'mpi')
| -rw-r--r-- | mpi/mpi.c | 9 | ||||
| -rw-r--r-- | mpi/mpi.h | 6 | ||||
| -rw-r--r-- | mpi/mplogic.c | 3 |
3 files changed, 11 insertions, 7 deletions
@@ -10,11 +10,18 @@ */ #include "config.h" -#include "mpi.h" +#if MP_IOFUNC +#include <stdio.h> +#include <ctype.h> +#endif #include <stdlib.h> #include <string.h> #include <ctype.h> #include <math.h> +#include "mpi.h" +#if MP_ARGCHK == 2 +#include <assert.h> +#endif #define MAX(A, B) ((A) > (B) ? (A) : (B)) #define MIN(A, B) ((A) < (B) ? (A) : (B)) @@ -16,11 +16,6 @@ #define MP_IOFUNC 1 #endif -#if MP_IOFUNC -#include <stdio.h> -#include <ctype.h> -#endif - #include <limits.h> #define MP_NEG 1 @@ -60,7 +55,6 @@ #if MP_ARGCHK == 1 #define ARGCHK(X,Y) {if(!(X)){return (Y);}} #elif MP_ARGCHK == 2 -#include <assert.h> #define ARGCHK(X,Y) assert(X) #else #define ARGCHK(X,Y) /* */ diff --git a/mpi/mplogic.c b/mpi/mplogic.c index 2d1cf7bf..eb44b866 100644 --- a/mpi/mplogic.c +++ b/mpi/mplogic.c @@ -11,6 +11,9 @@ #include "config.h" #include "mplogic.h" +#if MP_ARGCHK == 2 +#include <assert.h> +#endif #include <stdlib.h> /* Some things from the guts of the MPI library we make use of... */ |