From 294a01e57f7d2283da4dd1e6f01e11d7f464b7c9 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Thu, 17 Jul 2003 10:57:08 -0500 Subject: [svn-r7237] Purpose: Code cleanup Description: Move PABLO_MASK above including headers. Platforms tested: FreeBSD 4.8 (sleipnir) too minor for h5committest --- src/H5Z.c | 7 ++++--- src/H5Zdeflate.c | 5 ++++- src/H5Zfletcher32.c | 5 ++++- src/H5Zshuffle.c | 5 ++++- src/H5Zszip.c | 5 ++++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/H5Z.c b/src/H5Z.c index 863364e..6994a8b 100644 --- a/src/H5Z.c +++ b/src/H5Z.c @@ -14,6 +14,10 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ +/* Pablo mask */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Z_mask + #include "H5private.h" /* Generic Functions */ #include "H5Dprivate.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ @@ -24,9 +28,6 @@ #include "H5Sprivate.h" /* Dataspace functions */ #include "H5Zpkg.h" /* Data filters */ -/* Pablo mask */ -#define PABLO_MASK H5Z_mask - /* Interface initialization */ #define INTERFACE_INIT H5Z_init_interface static int interface_initialize_g = 0; diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 80004f7..ece24ba 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -19,6 +19,10 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Z_deflate_mask + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5MMprivate.h" /* Memory management */ @@ -31,7 +35,6 @@ #endif /* Interface initialization */ -#define PABLO_MASK H5Z_deflate_mask #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c index ce00955..56129bf 100644 --- a/src/H5Zfletcher32.c +++ b/src/H5Zfletcher32.c @@ -19,6 +19,10 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Z_fletcher32_mask + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5Fprivate.h" /* File access */ @@ -28,7 +32,6 @@ #ifdef H5_HAVE_FILTER_FLETCHER32 /* Interface initialization */ -#define PABLO_MASK H5Z_fletcher32_mask #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c index 79d8276..bc6e309 100644 --- a/src/H5Zshuffle.c +++ b/src/H5Zshuffle.c @@ -14,6 +14,10 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Z_shuffle_mask + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5MMprivate.h" /* Memory management */ @@ -24,7 +28,6 @@ #ifdef H5_HAVE_FILTER_SHUFFLE /* Interface initialization */ -#define PABLO_MASK H5Z_shuffle_mask #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Zszip.c b/src/H5Zszip.c index decf0d3..5d4922d 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -14,6 +14,10 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Z_szip_mask + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5Fprivate.h" /* File access */ @@ -30,7 +34,6 @@ #endif /* Interface initialization */ -#define PABLO_MASK H5Z_szip_mask #define INTERFACE_INIT NULL static int interface_initialize_g = 0; -- cgit v0.12