ase/inc/ase/cmn/macros.h

@@ -105,10 +105,7 @@
 	#ifdef __cplusplus
 	extern "C" {
 	#endif
-		void ase_assert_abort (void);
-		void ase_assert_puts (const ase_char_t* str);
-		/*void ase_assert_printf (const ase_char_t* fmt, ...);*/
-		int ase_assert_failed (
+		void ase_assert_failed (
         		const ase_char_t* expr, const ase_char_t* desc,
         		const ase_char_t* file, ase_size_t line);
 	#ifdef __cplusplus

ase/inc/ase/utl/ctype.h

@@ -1,5 +1,5 @@
 /*
- * $Id: ctype.h 131 2008-03-17 08:57:23Z baconevi $
+ * $Id: ctype.h 183 2008-06-03 08:18:55Z baconevi $
  */
 
 #ifndef _ASE_UTL_CTYPE_H_

ase/inc/ase/utl/getopt.h

@@ -1,5 +1,5 @@
 /*
- * $Id: getopt.h 137 2008-03-17 12:35:02Z baconevi $
+ * $Id: getopt.h 183 2008-06-03 08:18:55Z baconevi $
  *
  * {License}
  */

ase/inc/ase/utl/http.h

@@ -1,5 +1,5 @@
 /*
- * $Id: http.h 132 2008-03-17 10:27:02Z baconevi $
+ * $Id: http.h 183 2008-06-03 08:18:55Z baconevi $
  *
  * {License}
  */

ase/inc/ase/utl/main.h

@@ -1,5 +1,5 @@
 /*
- * $Id: main.h 132 2008-03-17 10:27:02Z baconevi $
+ * $Id: main.h 183 2008-06-03 08:18:55Z baconevi $
  * 
  * {License}
  */

ase/inc/ase/utl/stdio.h

@@ -1,5 +1,5 @@
 /*
- * $Id: stdio.h 148 2008-03-18 08:26:52Z baconevi $
+ * $Id: stdio.h 183 2008-06-03 08:18:55Z baconevi $
  * 
  * {License}
  */

ase/lib/cmn/descrip.mms

@@ -4,8 +4,8 @@
 
 objects = mem.obj,str_bas.obj,str_cnv.obj,str_dyn.obj,map.obj,rex.obj,misc.obj
 
-CFLAGS = /include="../.."
-#CFLAGS = /pointer_size=long /include="../.."
+CFLAGS = /include="../../inc"
+#CFLAGS = /pointer_size=long /include="../../inc"
 LIBRFLAGS = 
 
 asecmn.olb : $(objects)

ase/lib/cmn/misc.c

@@ -1,5 +1,5 @@
 /*
- * $Id: misc.c 116 2008-03-03 11:15:37Z baconevi $
+ * $Id: misc.c 191 2008-06-06 10:19:57Z baconevi $
  *
  * {License}
  */
@@ -9,31 +9,3 @@
 #define Library
 #endif
 
-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
-
-#ifndef NDEBUG
-int ase_assert_failed (
-	const ase_char_t* expr, const ase_char_t* desc, 
-	const ase_char_t* file, ase_size_t line)
-{
-	if (desc == ASE_NULL)
-	{
-		ase_assert_printf (
-			ASE_T("ASSERTION FAILURE AT FILE %s LINE %lu\n%s\n"),
-			file, (unsigned long)line, expr);
-	}
-	else
-	{
-		ase_assert_printf (
-			ASE_T("ASSERTION FAILURE AT FILE %s LINE %lu\n%s\n\nDESCRIPTION:\n%s\n"),
-			file, (unsigned long)line, expr, desc);
-
-	}
-
-	ase_assert_abort ();
-	return 0;
-}
-
-#endif
-

ase/lib/utl/assert.c

@@ -1,48 +1,38 @@
 /*
  * $Id$
- *
- * {License}
  */
 
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
+
 #ifndef NDEBUG
 
+#include <ase/cmn/stdio.h>
 #include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
 
-#ifdef _WIN32
-#include <windows.h>
-#include <tchar.h>
-#endif
-
-void ase_assert_abort (void)
+int ase_assert_failed (
+	const ase_char_t* expr, const ase_char_t* desc, 
+	const ase_char_t* file, ase_size_t line)
 {
+	if (desc == ASE_NULL)
+	{
+		ase_fprintf (
+			ASE_STDERR,
+			ASE_T("ASSERTION FAILURE AT FILE %s LINE %lu\n%s\n"),
+			file, (unsigned long)line, expr);
+	}
+	else
+	{
+		ase_fprintf (
+			ASE_STDERR,
+			ASE_T("ASSERTION FAILURE AT FILE %s LINE %lu\n%s\n\nDESCRIPTION:\n%s\n"),
+			file, (unsigned long)line, expr, desc);
+
+	}
+
 	abort ();
+	return 0;
 }
 
-void ase_assert_printf (const ase_char_t* fmt, ...)
-{
-	va_list ap;
-#ifdef _WIN32
-	int n;
-	ase_char_t buf[1024];
 #endif
 
-	va_start (ap, fmt);
-#if defined(_WIN32)
-	n = _vsntprintf (buf, ASE_COUNTOF(buf), fmt, ap);
-	if (n < 0) buf[ASE_COUNTOF(buf)-1] = ASE_T('\0');
-
-	#if defined(_MSC_VER) && (_MSC_VER<1400)
-	MessageBox (NULL, buf, 
-		ASE_T("Assertion Failure"), MB_OK|MB_ICONERROR);
-	#else
-	MessageBox (NULL, buf, 
-		ASE_T("\uB2DD\uAE30\uB9AC \uC870\uB610"), MB_OK|MB_ICONERROR);
-	#endif
-#else
-	ase_vprintf (fmt, ap);
-#endif
-	va_end (ap);
-}
-#endif

ase/lib/utl/makefile.in

@@ -4,16 +4,19 @@
 
 NAME = aseutl
 
+TOP_DIR = @abs_top_builddir@
+
 CC = @CC@
 AR = @AR@
 MAKE = @MAKE@
 RANLIB = @RANLIB@
-CFLAGS = @CFLAGS@ -I@abs_top_builddir@/..
+CFLAGS = @CFLAGS@ -I$(TOP_DIR)/inc
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 MODE = @BUILDMODE@
 
-OUT_DIR = ../$(MODE)/lib
+
+OUT_DIR = $(TOP_DIR)/out/$(MODE)/lib
 OUT_FILE = $(OUT_DIR)/lib$(NAME).a
 
 TMP_DIR = $(MODE)