summaryrefslogtreecommitdiffstats
path: root/src/H5Opkg.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-09-22 17:33:58 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-09-22 17:33:58 (GMT)
commit926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8 (patch)
treead06b825bd0d4dc30c88ab14dda1abe0c87f4ed5 /src/H5Opkg.h
parent531822d443296bfe74a76aed6c121ec8421508a5 (diff)
downloadhdf5-926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8.zip
hdf5-926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8.tar.gz
hdf5-926cfe52cc14c735e53709e8b8dc3bfc4d0f8dd8.tar.bz2
[svn-r15677] Description:
Bring r15676 back from trunk: Centralize all macros for declaring "magic numbers"/signatures for objects in the file into src/H5Fprivate.h, so it's easier to know what values have already been defined, etc. Tested on: Mac OS X/32 10.5.5 (amazon) Too minor to require h5committest
Diffstat (limited to 'src/H5Opkg.h')
-rw-r--r--src/H5Opkg.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index c3737f5..a36ef6f 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -67,13 +67,6 @@
#define H5O_ALIGN_F(F, X) \
H5O_ALIGN_VERS((H5F_USE_LATEST_FORMAT(F) ? H5O_VERSION_LATEST : H5O_VERSION_1), X)
-/* Size of signature information (on disk) */
-#define H5O_SIZEOF_MAGIC 4
-
-/* Object header signatures */
-#define H5O_HDR_MAGIC "OHDR" /* Header */
-#define H5O_CHK_MAGIC "OCHK" /* Continuation chunk */
-
/* Size of checksum (on disk) */
#define H5O_SIZEOF_CHKSUM 4
@@ -106,7 +99,7 @@
4 + /*reference count */ \
4) /*chunk data size */ \
: \
- (H5O_SIZEOF_MAGIC + /*magic number */ \
+ (H5_SIZEOF_MAGIC + /*magic number */ \
1 + /*version number */ \
1 + /*flags */ \
(((O)->flags & H5O_HDR_STORE_TIMES) ? ( \
@@ -155,7 +148,7 @@
0 + /*no magic # */ \
0 /*no checksum */ \
: \
- H5O_SIZEOF_MAGIC + /*magic # */ \
+ H5_SIZEOF_MAGIC + /*magic # */ \
H5O_SIZEOF_CHKSUM /*checksum */ \
)
#define H5O_SIZEOF_CHKHDR_OH(O) \