From 9a069ffaeb267e371c0c664b51696ce8ca85cac1 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sun, 18 Feb 2007 16:21:10 +0000
Subject: [PATCH] *** empty log message ***

---
 ase/awk/rex.c | 26 +++++++++++++++++---------
 ase/pack.h    |  4 ++--
 ase/unpack.h  |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ase/awk/rex.c b/ase/awk/rex.c
index 91bca6c9..4507562d 100644
--- a/ase/awk/rex.c
+++ b/ase/awk/rex.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rex.c,v 1.63 2007-02-18 15:51:07 bacon Exp $
+ * $Id: rex.c,v 1.64 2007-02-18 16:21:10 bacon Exp $
  *
  * {License}
  */
@@ -53,15 +53,19 @@ typedef struct __builder_t __builder_t;
 typedef struct __matcher_t __matcher_t;
 typedef struct __match_t __match_t;
 
-ASE_BEGIN_PACKED_STRUCT(__code_t)
+#include <ase/pack.h>
+
+struct __code_t
+{
 	/*ase_byte_t cmd;*/
 	short cmd;
 	short negate; /* only for CMD_CHARSET */
 	ase_size_t lbound;
 	ase_size_t ubound;
-ASE_END_PACKED_STRUCT()
+};
 
-ASE_BEGIN_PACKED_STRUCT(__builder_t)
+struct __builder_t
+{
 	ase_awk_t* awk;
 
 	struct
@@ -90,9 +94,10 @@ ASE_BEGIN_PACKED_STRUCT(__builder_t)
 	} depth;
 
 	int errnum;
-ASE_END_PACKED_STRUCT()
+};
 
-ASE_BEGIN_PACKED_STRUCT(__matcher_t)
+struct __matcher_t
+{
 	ase_awk_t* awk;
 
 	struct
@@ -112,9 +117,10 @@ ASE_BEGIN_PACKED_STRUCT(__matcher_t)
 
 	int ignorecase;
 	int errnum;
-ASE_END_PACKED_STRUCT()
+};
 
-ASE_BEGIN_PACKED_STRUCT(__match_t)
+struct __match_t
+{
 	const ase_char_t* match_ptr;
 
 	ase_bool_t matched;
@@ -122,7 +128,9 @@ ASE_BEGIN_PACKED_STRUCT(__match_t)
 
 	const ase_byte_t* branch;
 	const ase_byte_t* branch_end;
-ASE_END_PACKED_STRUCT()
+};
+
+#include <ase/pack.h>
 
 typedef const ase_byte_t* (*atom_matcher_t) (
 	__matcher_t* matcher, const ase_byte_t* base, __match_t* mat);
diff --git a/ase/pack.h b/ase/pack.h
index 7d368e1f..535ff7ba 100644
--- a/ase/pack.h
+++ b/ase/pack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.h,v 1.1 2007-02-18 15:51:07 bacon Exp $
+ * $Id: pack.h,v 1.2 2007-02-18 16:21:10 bacon Exp $
  *
  * {License}
  */
@@ -7,5 +7,5 @@
 #if defined(__GNUC__)
 #pragma pack(push,1)
 #elif defined(__HP_aCC) || defined(__HP_cc)
-#pragma pack(1)
+#pragma PACK 1
 #endif
diff --git a/ase/unpack.h b/ase/unpack.h
index c25881ca..8ba5e157 100644
--- a/ase/unpack.h
+++ b/ase/unpack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: unpack.h,v 1.1 2007-02-18 15:51:07 bacon Exp $
+ * $Id: unpack.h,v 1.2 2007-02-18 16:21:10 bacon Exp $
  *
  * {License}
  */
@@ -7,5 +7,5 @@
 #if defined(__GNUC__)
 #pragma pack(pop)
 #elif defined(__HP_aCC) || defined(__HP_cc)
-#pragma pack
+#pragma PACK
 #endif