From 58b9a8e4f778c1051a4d5fe7d46a90eabd12e0e5 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Wed, 7 Feb 2007 14:51:44 +0000
Subject: [PATCH] *** empty log message ***

---
 ase/awk/awk_i.h              |  6 +++---
 ase/conf_msw.h               |  8 ++++----
 ase/test/awk/makefile.msw.cl | 14 +++++++++++++-
 ase/types.h                  |  8 +++++++-
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ase/awk/awk_i.h b/ase/awk/awk_i.h
index e8bcd133..cd3cf1a7 100644
--- a/ase/awk/awk_i.h
+++ b/ase/awk/awk_i.h
@@ -1,5 +1,5 @@
 /*
- * $Id: awk_i.h,v 1.100 2007-02-03 10:47:40 bacon Exp $
+ * $Id: awk_i.h,v 1.101 2007-02-07 14:51:44 bacon Exp $
  *
  * {License}
  */
@@ -151,8 +151,8 @@ struct ase_awk_t
 		{
 			ase_cint_t curc;
 			ase_cint_t ungotc[5];
-			ase_cint_t ungotc_line[5];
-			ase_cint_t ungotc_column[5];
+			ase_size_t ungotc_line[5];
+			ase_size_t ungotc_column[5];
 			ase_size_t ungotc_count;
 
 			ase_size_t line;
diff --git a/ase/conf_msw.h b/ase/conf_msw.h
index 4a481827..0a9c7c65 100644
--- a/ase/conf_msw.h
+++ b/ase/conf_msw.h
@@ -1,5 +1,5 @@
 /*
- * $Id: conf_msw.h,v 1.7 2007-02-03 10:52:35 bacon Exp $
+ * $Id: conf_msw.h,v 1.8 2007-02-07 14:51:44 bacon Exp $
  *
  * {License}
  */
@@ -25,11 +25,11 @@ _M_X64 x64 platform
 #define ASE_SIZEOF_SHORT 2
 #define ASE_SIZEOF_INT 4
 
-#ifdef _WIN64
+/*#ifdef _WIN64
 	#define ASE_SIZEOF_LONG 8
-#else
+#else*/
 	#define ASE_SIZEOF_LONG 4
-#endif
+/*#endif*/
 
 #ifdef __POCC__ 
 	/* pelles c with no microsoft extension */
diff --git a/ase/test/awk/makefile.msw.cl b/ase/test/awk/makefile.msw.cl
index 6c97c329..7fb27bb5 100644
--- a/ase/test/awk/makefile.msw.cl
+++ b/ase/test/awk/makefile.msw.cl
@@ -3,7 +3,19 @@ CFLAGS = /nologo /MT /W3 /GR- -I..\..\.. -D_WIN32_WINNT=0x0400
 LDFLAGS = /libpath:..\..\awk
 LIBS = aseawk.lib kernel32.lib user32.lib
 
-all: awk #rex2 rex3
+!if !defined(CPU) || "$(CPU)" == ""
+CPU = $(PROCESSOR_ARCHITECTURE)
+!endif # CPU
+
+!if "$(CPU)" == ""
+CPU = i386
+!endif
+
+!if "$(CPU)" == "IA64"
+LIBS = $(LIBS) bufferoverflowu.lib
+!endif
+
+all: awk
 
 awk: awk.obj
 	link /nologo /out:$@.exe $(LDFLAGS) $(LIBS) awk.obj
diff --git a/ase/types.h b/ase/types.h
index 486c9b7c..a59418b2 100644
--- a/ase/types.h
+++ b/ase/types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: types.h,v 1.67 2007-02-07 06:56:55 bacon Exp $
+ * $Id: types.h,v 1.68 2007-02-07 14:51:44 bacon Exp $
  *
  * {License}
  */
@@ -44,6 +44,12 @@ typedef int ase_tri_t;
 #elif ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG_LONG
 	typedef long long ase_int_t;
 	typedef unsigned long long ase_uint_t;
+#elif ASE_SIZEOF_VOID_P == ASE_SIZEOF___INT32
+	typedef __int32 ase_int_t;
+	typedef unsigned __int32 ase_uint_t;
+#elif ASE_SIZEOF_VOID_P == ASE_SIZEOF___INT64
+	typedef __int64 ase_int_t;
+	typedef unsigned __int64 ase_uint_t;
 #else
 	#error unsupported pointer size
 #endif