From d963b1276f37e2eac42cdb5a4372772462c42bf2 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Wed, 7 Feb 2007 05:43:37 +0000
Subject: [PATCH] *** empty log message ***

---
 ase/conf_vms.h     | 44 +++++++++++++++++++++++++++++---------------
 ase/test/awk/awk.c | 10 +++++-----
 ase/utl/printf.c   |  3 ++-
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ase/conf_vms.h b/ase/conf_vms.h
index 523ca0d3..cbe6cdc4 100644
--- a/ase/conf_vms.h
+++ b/ase/conf_vms.h
@@ -1,10 +1,10 @@
 /*
- * $Id: conf_vms.h,v 1.8 2007-02-03 10:52:36 bacon Exp $
+ * $Id: conf_vms.h,v 1.9 2007-02-07 05:43:37 bacon Exp $
  *
  * {License}
  */
 
-/* TODO: please complete the itanium portion */
+/* TODO: please complete the ia64 portion */
 
 /* both vax and alpha are in the little endian. */
 #define ASE_ENDIAN_LITTLE 
@@ -18,7 +18,7 @@
 	#define ASE_SIZEOF_LONG_LONG 0
 #elif defined(alpha) || defined(__alpha)
 	#define ASE_SIZEOF_LONG_LONG 8
-#elif defined(itanium) || defined(__itanium)
+#elif defined(ia64) || defined(__ia64)
 	#define ASE_SIZEOF_LONG_LONG 8
 #else
 	#define ASE_SIZEOF_LONG_LONG 0
@@ -32,7 +32,7 @@
 	#define ASE_SIZEOF___INT64 0
 #elif defined(alpha) || defined(__alpha)
 	#define ASE_SIZEOF___INT64 8
-#elif defined(itanium) || defined(__itanium)
+#elif defined(ia64) || defined(__ia64)
 	#define ASE_SIZEOF___INT64 8
 #else
 	#define ASE_SIZEOF___INT64 0
@@ -44,17 +44,31 @@
 #if defined(vax) || defined(__vax)
 	#define ASE_SIZEOF_VOID_P 4
 #elif defined(alpha) || defined(__alpha)
-	/*#pragma pointer_size 32
-	#define ASE_SIZEOF_VOID_P 4*/
-	#pragma pointer_size 64
-	#define ASE_SIZEOF_VOID_P 8
-#elif defined(itanium) || defined(__itanium)
-	/*#pragma pointer_size 32
-	#define ASE_SIZEOF_VOID_P 4*/
-	#pragma pointer_size 64
-	#define ASE_SIZEOF_VOID_P 8
+	#if __INITIAL_POINTER_SIZE==64
+		#pragma pointer_size 64
+		#define ASE_SIZEOF_VOID_P 8
+	#elif __INITIAL_POINTER_SIZE==32
+		#pragma pointer_size 32
+		#define ASE_SIZEOF_VOID_P 4
+	#elif __INITIAL_POINTER_SIZE==0
+		#define ASE_SIZEOF_VOID_P 4
+	#else
+		#error "unsupported initial pointer size"
+	#endif
+#elif defined(ia64) || defined(__ia64)
+	#if __INITIAL_POINTER_SIZE==64
+		#pragma pointer_size 64
+		#define ASE_SIZEOF_VOID_P 8
+	#elif __INITIAL_POINTER_SIZE==32 
+		#pragma pointer_size 32
+		#define ASE_SIZEOF_VOID_P 4
+	#elif __INITIAL_POINTER_SIZE==0
+		#define ASE_SIZEOF_VOID_P 4
+	#else
+		#error "unsupported initial pointer size"
+	#endif
 #else
-	#define ASE_SIZEOF_VOID_P 0
+	#error "unsupported architecture"
 #endif
 
 #define ASE_SIZEOF_FLOAT 4
@@ -64,7 +78,7 @@
 	#define ASE_SIZEOF_LONG_DOUBLE 8
 #elif defined(alpha) || defined(__alpha)
 	#define ASE_SIZEOF_LONG_DOUBLE 16
-#elif defined(itanium) || defined(__itanium)
+#elif defined(ia64) || defined(__ia64)
 	#define ASE_SIZEOF_LONG_DOUBLE 16
 #else
 	#define ASE_SIZEOF_LONG_DOUBLE 0
diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c
index d098af75..7f40cd7e 100644
--- a/ase/test/awk/awk.c
+++ b/ase/test/awk/awk.c
@@ -1,5 +1,5 @@
 /*
- * $Id: awk.c,v 1.162 2007-02-03 10:52:36 bacon Exp $
+ * $Id: awk.c,v 1.163 2007-02-07 05:43:37 bacon Exp $
  */
 
 #include <ase/awk/awk.h>
@@ -181,7 +181,7 @@ static ase_ssize_t process_source (
 	int cmd, void* arg, ase_char_t* data, ase_size_t size)
 {
 	struct src_io* src_io = (struct src_io*)arg;
-	ase_char_t c;
+	ase_cint_t c;
 
 	if (cmd == ASE_AWK_IO_OPEN)
 	{
@@ -201,7 +201,7 @@ static ase_ssize_t process_source (
 		if (size <= 0) return -1;
 		c = awk_fgetc ((FILE*)src_io->input_handle);
 		if (c == ASE_CHAR_EOF) return 0;
-		*data = c;
+		*data = (ase_char_t)c;
 		return 1;
 	}
 
@@ -750,7 +750,7 @@ static void print_usage (const ase_char_t* argv0)
 	awk_printf (ASE_T("Usage: %s [-m] [-d] [-a argument]* -f source-file [data-file]*\n"), argv0);
 }
 
-static int __main (int argc, ase_char_t* argv[])
+static int awk_main (int argc, ase_char_t* argv[])
 {
 	ase_awk_t* awk;
 	ase_awk_srcios_t srcios;
@@ -989,7 +989,7 @@ int ase_main (int argc, ase_char_t* argv[])
 	_CrtSetDbgFlag (_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF);
 #endif*/
 
-	n = __main (argc, argv);
+	n = awk_main (argc, argv);
 
 #if defined(__linux) && defined(_DEBUG)
 	muntrace ();
diff --git a/ase/utl/printf.c b/ase/utl/printf.c
index ab003eec..f16750aa 100644
--- a/ase/utl/printf.c
+++ b/ase/utl/printf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: printf.c,v 1.9 2007-02-03 10:52:36 bacon Exp $
+ * $Id: printf.c,v 1.10 2007-02-07 05:43:37 bacon Exp $
  *
  * {License}
  */
@@ -309,6 +309,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format)
 	}
 
 	buf.ptr[buf.len] = ASE_T('\0');
+
 	return buf.ptr;
 }