[ismrmrd] 13/281: Changing packing to 2 bytes for ismrmrd.h

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 6cc3a34f4fc8203c01a29f53526c7e31e24de037
Author: Michael S. Hansen <michael.hansen at nih.gov>
Date:   Sun Aug 19 10:35:55 2012 -0400

    Changing packing to 2 bytes for ismrmrd.h
---
 examples/data/.gitignore |  1 +
 ismrmrd.h                | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/examples/data/.gitignore b/examples/data/.gitignore
new file mode 100644
index 0000000..424e4bc
--- /dev/null
+++ b/examples/data/.gitignore
@@ -0,0 +1 @@
+*.h5
\ No newline at end of file
diff --git a/ismrmrd.h b/ismrmrd.h
index 474cf8d..07c9c18 100644
--- a/ismrmrd.h
+++ b/ismrmrd.h
@@ -11,15 +11,17 @@
 #define ISMRMRD_H
 
 /* Cross platform section for defining integer types */
-#ifdef _MSC_VER
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
+#ifndef ISMRMRD_HAS_BASIC_TYPES
+	#ifdef _MSC_VER
+		typedef __int16 int16_t;
+		typedef unsigned __int16 uint16_t;
+		typedef __int32 int32_t;
+		typedef unsigned __int32 uint32_t;
+		typedef __int64 int64_t;
+		typedef unsigned __int64 uint64_t;
+	#else
+		#include <stdint.h>
+	#endif
 #endif
 
 #include <stdio.h>
@@ -27,7 +29,7 @@ typedef unsigned __int64 uint64_t;
 #include <exception>
 #include <iostream>
 
-#pragma pack(push, 4) //Use 4 byte alignment
+#pragma pack(push, 2) //Use 2 byte alignment
 
 #define ISMRMRD_VERSION 1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git