From 3847f21e2b874454234dba7a137494db10541b2c Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sun, 14 Oct 2007 02:25:00 +0000
Subject: [PATCH] Recovered from cvs revision 2007-10-13 15:44:00

---
 ase/awk/Awk.cpp     |  8 ++++++--
 ase/awk/Awk.hpp     |  4 ++--
 ase/awk/dmc-msw.mak | 12 ++++++------
 ase/awk/makefile.in |  4 ++--
 ase/cmn/conf_msw.h  |  4 ++--
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ase/awk/Awk.cpp b/ase/awk/Awk.cpp
index 2763ddb9..b492284c 100644
--- a/ase/awk/Awk.cpp
+++ b/ase/awk/Awk.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: Awk.cpp,v 1.73 2007/10/13 05:08:28 bacon Exp $
+ * $Id: Awk.cpp,v 1.74 2007/10/13 06:28:17 bacon Exp $
  *
  * {License}
  */
@@ -195,7 +195,11 @@ void Awk::Argument::clear ()
 		{
 			if (this->val->type != ASE_AWK_VAL_STR)
 			{
-				awk_t* awk = this->run->awk->awk,
+			#if defined(__DMC__)
+				awk_t* awk = (awk_t*)*(this->run->awk);
+			#else
+				awk_t* awk = this->run->awk->awk;
+			#endif
 				ase_awk_free (awk, this->str.ptr);
 			}
 
diff --git a/ase/awk/Awk.hpp b/ase/awk/Awk.hpp
index 1545cfe1..6d695cdf 100644
--- a/ase/awk/Awk.hpp
+++ b/ase/awk/Awk.hpp
@@ -1,5 +1,5 @@
 /*
- * $Id: Awk.hpp,v 1.73 2007/10/10 13:22:12 bacon Exp $
+ * $Id: Awk.hpp,v 1.74 2007/10/13 06:28:17 bacon Exp $
  *
  * {License}
  */
@@ -302,7 +302,7 @@ public:
 		void* operator new (size_t n, awk_t* awk) throw ();
 		void* operator new[] (size_t n, awk_t* awk) throw ();
 
-	#if !defined(__BORLANDC__)
+	#if !defined(__BORLANDC__) 
 		// deletion when initialization fails
 		void operator delete (void* p, awk_t* awk);
 		void operator delete[] (void* p, awk_t* awk);
diff --git a/ase/awk/dmc-msw.mak b/ase/awk/dmc-msw.mak
index 3ba0b08c..56a39362 100644
--- a/ase/awk/dmc-msw.mak
+++ b/ase/awk/dmc-msw.mak
@@ -11,9 +11,9 @@ LD = link
 AR = lib
 JAVAC = javac
 
-CFLAGS = -mn -I../.. $(JNI_INC) 
-CXXFLAGS = -cpp -mn -I../.. $(JNI_INC) 
-JAVACFLAGS = -classpath ../.. -Xlint:unchecked
+CFLAGS = -mn -I..\.. $(JNI_INC) 
+CXXFLAGS = -Aa -Ab -Ae -mn -I..\.. $(JNI_INC) 
+JAVACFLAGS = -classpath ..\.. -Xlint:unchecked
 
 MODE=debug
 
@@ -24,7 +24,7 @@ OUT_FILE_LIB_CXX = $(OUT_DIR)\$(NAME)pp.lib
 OUT_FILE_JAR = $(OUT_DIR)/$(NAME).jar
 
 TMP_DIR = $(MODE)
-TMP_DIR_CXX = $(TMP_DIR)/cxx
+TMP_DIR_CXX = $(TMP_DIR)\cxx
 
 OBJ_FILES_LIB = \
 	$(TMP_DIR)\awk.obj \
@@ -59,7 +59,7 @@ OBJ_FILES_JAR = \
 
 lib: build$(JNI)
 
-build: $(OUT_FILE_LIB) 
+build: $(OUT_FILE_LIB) $(OUT_FILE_LIB_CXX)
 
 buildjni: build $(OUT_FILE_JNI)
 
@@ -148,7 +148,7 @@ $(TMP_DIR):
 	md $(TMP_DIR)
 
 $(TMP_DIR_CXX): $(TMP_DIR)
-	md $(TMP_DIR)/cxx
+	md $(TMP_DIR_CXX)
 
 clean:
 	rm -rf $(OUT_FILE_LIB) $(OUT_FILE_JNI) $(OUT_FILE_JAR) $(OUT_FILE_LIB_CXX) $(OBJ_FILES_LIB) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OBJ_FILES_LIB_CXX)
diff --git a/ase/awk/makefile.in b/ase/awk/makefile.in
index b60ca014..ad09b346 100644
--- a/ase/awk/makefile.in
+++ b/ase/awk/makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: makefile.in,v 1.8 2007/10/13 05:08:28 bacon Exp $
+# $Id: makefile.in,v 1.9 2007/10/13 06:28:17 bacon Exp $
 #
 
 NAME = aseawk
@@ -164,7 +164,7 @@ $(TMP_DIR):
 	mkdir -p $(TMP_DIR)
 
 $(TMP_DIR_CXX): $(TMP_DIR)
-	mkdir -p $(TMP_DIR)/cxx
+	mkdir -p $(TMP_DIR_CXX)
 
 clean:
 	rm -rf $(OUT_FILE_LIB) $(OUT_FILE_JNI) $(OUT_FILE_JAR) $(OUT_FILE_LIB_CXX) $(OBJ_FILES_LIB) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OBJ_FILES_LIB_CXX)
diff --git a/ase/cmn/conf_msw.h b/ase/cmn/conf_msw.h
index 6347a072..e1d16d09 100644
--- a/ase/cmn/conf_msw.h
+++ b/ase/cmn/conf_msw.h
@@ -1,5 +1,5 @@
 /*
- * $Id: conf_msw.h,v 1.3 2007/04/30 05:55:36 bacon Exp $
+ * $Id: conf_msw.h,v 1.4 2007/10/13 06:28:17 bacon Exp $
  *
  * {License}
  */
@@ -31,7 +31,7 @@ _M_X64 x64 platform
 	#define ASE_SIZEOF_LONG 4
 /*#endif*/
 
-#ifdef __POCC__ 
+#if defined(__POCC__) || defined(__DMC__)
 	/* pelles c with no microsoft extension */
 	#define ASE_SIZEOF_LONG_LONG 8