From 198b42407eb44270d07bf36ec944c142cdab616a Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Wed, 16 Aug 2006 09:35:21 +0000
Subject: [PATCH] *** empty log message ***

---
 ase/awk/awk_i.h        |  4 +--
 ase/awk/makefile.ntddk |  1 +
 ase/awk/rex.c          |  6 +++-
 ase/awk/sa.h           | 71 +++++++++++++++++++++++++++++-------------
 ase/awk/sources        |  8 +++++
 5 files changed, 65 insertions(+), 25 deletions(-)
 create mode 100644 ase/awk/makefile.ntddk
 create mode 100644 ase/awk/sources

diff --git a/ase/awk/awk_i.h b/ase/awk/awk_i.h
index 7c366cfb..a605de96 100644
--- a/ase/awk/awk_i.h
+++ b/ase/awk/awk_i.h
@@ -1,5 +1,5 @@
 /*
- * $Id: awk_i.h,v 1.44 2006-08-13 05:55:02 bacon Exp $
+ * $Id: awk_i.h,v 1.45 2006-08-16 09:35:21 bacon Exp $
  */
 
 #ifndef _XP_AWK_AWKI_H_
@@ -27,7 +27,7 @@ typedef struct xp_awk_tree_t xp_awk_tree_t;
 #include <xp/awk/run.h>
 #include <xp/awk/extio.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning (disable: 4996)
 #endif
 
diff --git a/ase/awk/makefile.ntddk b/ase/awk/makefile.ntddk
new file mode 100644
index 00000000..5acbbd24
--- /dev/null
+++ b/ase/awk/makefile.ntddk
@@ -0,0 +1 @@
+!INCLUDE $(NTMAKEENV)\makefile.def
diff --git a/ase/awk/rex.c b/ase/awk/rex.c
index c9925f16..bf82f86b 100644
--- a/ase/awk/rex.c
+++ b/ase/awk/rex.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rex.c,v 1.20 2006-08-16 08:55:43 bacon Exp $
+ * $Id: rex.c,v 1.21 2006-08-16 09:35:21 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
@@ -49,6 +49,10 @@ enum
 	CHARSET_CLASS_ALNUM
 };
 
+#ifdef _MSC_VER
+#pragma warning (disable: 4296)
+#endif
+
 #define BOUND_MIN 0
 #define BOUND_MAX (XP_TYPE_MAX(xp_size_t))
 
diff --git a/ase/awk/sa.h b/ase/awk/sa.h
index fe61158d..80b45279 100644
--- a/ase/awk/sa.h
+++ b/ase/awk/sa.h
@@ -1,5 +1,5 @@
 /*
- * $Id: sa.h,v 1.29 2006-08-13 16:04:32 bacon Exp $
+ * $Id: sa.h,v 1.30 2006-08-16 09:35:21 bacon Exp $
  */
 
 #ifndef _XP_AWK_SA_H_
@@ -15,29 +15,58 @@
 #error Neither XP_CHAR_IS_MCHAR nor XP_CHAR_IS_WCHAR is defined.
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <assert.h>
+#ifdef XP_AWK_NTDDK
+	#include <ntddk.h>
+	#include <stdio.h>
+	#include <stdarg.h>
+	#include <stdlib.h>
 
-#ifdef XP_CHAR_IS_MCHAR
-#include <ctype.h>
+	#ifdef XP_CHAR_IS_MCHAR
+		#include <ctype.h>
+	#else
+		#include <ctype.h>
+		#include <wchar.h>
+	#endif
+
+	#define xp_assert ASSERT
+
+	#define xp_malloc malloc
+	#define xp_calloc calloc
+	#define xp_realloc realloc
+	#define xp_free free
+
+	#define xp_memset(dst,fill,len) RtlFillMemory(dst,len,fill)
+	#define xp_memcpy(dst,src,len) RtlCopyMemory(dst,src,len)
+	#define xp_memcmp(src1,src2,len) RtlCompareMemory(src1,src2,len);
 #else
-#include <ctype.h>
-#include <wchar.h>
-#if !defined(__BEOS__)
-#include <wctype.h>
-#endif
+	#include <stdio.h>
+	#include <stdlib.h>
+	#include <string.h>
+	#include <stdarg.h>
+	#include <assert.h>
+
+	#ifdef XP_CHAR_IS_MCHAR
+		#include <ctype.h>
+	#else
+		#include <ctype.h>
+		#include <wchar.h>
+		#if !defined(__BEOS__)
+			#include <wctype.h>
+		#endif
+	#endif
+
+	#define xp_assert assert
+
+	#define xp_malloc malloc
+	#define xp_calloc calloc
+	#define xp_realloc realloc
+	#define xp_free free
+
+	#define xp_memset(dst,fill,len)  memset(dst,fill,len)
+	#define xp_memcpy(dst,src,len)   memcpy(dst,src,len)
+	#define xp_memcmp(src1,src2,len) memcmp(src1,src2,len);
 #endif
 
-#define xp_malloc malloc
-#define xp_calloc calloc
-#define xp_realloc realloc
-#define xp_free free
-#define xp_memset memset
-#define xp_memcpy memcpy
-#define xp_assert assert
 
 #ifdef XP_CHAR_IS_MCHAR
 #define xp_isdigit isdigit
@@ -69,8 +98,6 @@
 #define xp_tolower towlower
 #endif
 
-#define xp_memcpy memcpy
-#define xp_memcmp memcmp
 
 #define xp_va_start(pvar,param) va_start(pvar,param)
 #define xp_va_list va_list
diff --git a/ase/awk/sources b/ase/awk/sources
new file mode 100644
index 00000000..c0abec19
--- /dev/null
+++ b/ase/awk/sources
@@ -0,0 +1,8 @@
+TARGETNAME=xpawk
+TARGETPATH=obj
+TARGETTYPE=DRIVER_LIBRARY
+
+SOURCES=awk.c err.c tree.c tab.c map.c parse.c run.c sa.c val.c func.c misc.c extio.c rex.c
+
+C_DEFINES=-DXP_AWK_STAND_ALONE  -DXP_AWK_NTDDK
+INCLUDES=..\..