summaryrefslogtreecommitdiff
path: root/mbglib/common/mbggeo.h
diff options
context:
space:
mode:
Diffstat (limited to 'mbglib/common/mbggeo.h')
-rw-r--r--mbglib/common/mbggeo.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/mbglib/common/mbggeo.h b/mbglib/common/mbggeo.h
index c375570..415064a 100644
--- a/mbglib/common/mbggeo.h
+++ b/mbglib/common/mbggeo.h
@@ -1,7 +1,7 @@
/**************************************************************************
*
- * $Id: mbggeo.h 1.10 2008/09/03 14:54:28 martin REL_M $
+ * $Id: mbggeo.h 1.11 2011/06/22 10:18:10 martin REL_M $
*
* Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany
*
@@ -22,6 +22,8 @@
*
* -----------------------------------------------------------------------
* $Log: mbggeo.h $
+ * Revision 1.11 2011/06/22 10:18:10 martin
+ * Cleaned up handling of pragma pack().
* Revision 1.10 2008/09/03 14:54:28 martin
* Added macros to swap endianess of structures.
* Revision 1.9 2008/01/17 09:31:33 daniel
@@ -62,8 +64,9 @@
/* Start of header body */
-#if defined( _USE_PACK ) // set byte alignment
- #pragma pack( 1 )
+#if defined( _USE_PACK )
+ #pragma pack( 1 ) // set byte alignment
+ #define _USING_BYTE_ALIGNMENT
#endif
@@ -284,8 +287,9 @@ extern "C" {
#endif
-#if defined( _USE_PACK ) // set default alignment
- #pragma pack()
+#if defined( _USING_BYTE_ALIGNMENT )
+ #pragma pack() // set default alignment
+ #undef _USING_BYTE_ALIGNMENT
#endif
/* End of header body */