From c3d06f762b53e3551b07b21e4e573151f239f1d0 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 23 Jun 2006 11:50:34 +0000 Subject: [PATCH] *** empty log message *** --- ase/awk/sa.c | 13 ++++++++----- ase/macros.h | 8 +------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ase/awk/sa.c b/ase/awk/sa.c index c8b08dc1..c407ce22 100644 --- a/ase/awk/sa.c +++ b/ase/awk/sa.c @@ -1,5 +1,5 @@ /* - * $Id: sa.c,v 1.21 2006-05-06 12:52:36 bacon Exp $ + * $Id: sa.c,v 1.22 2006-06-23 11:48:19 bacon Exp $ */ #include @@ -70,10 +70,13 @@ xp_size_t xp_strncpy (xp_char_t* buf, const xp_char_t* str, xp_size_t len) int xp_strcmp (const xp_char_t* s1, const xp_char_t* s2) { - while (*s1 == *s2 && *s2 != XP_T('\0')) s1++, s2++; - if (*s1 > *s2) return 1; - else if (*s1 < *s2) return -1; - return 0; + while (*s1 == *s2) + { + if (*s1 == XP_CHAR('\0')) return 0; + s1++, s2++; + } + + return (*s1 > *s2)? 1: -1; } int xp_strxncmp ( diff --git a/ase/macros.h b/ase/macros.h index 6f716c28..feb6b811 100644 --- a/ase/macros.h +++ b/ase/macros.h @@ -1,5 +1,5 @@ /* - * $Id: macros.h,v 1.33 2006-06-23 11:48:18 bacon Exp $ + * $Id: macros.h,v 1.34 2006-06-23 11:50:34 bacon Exp $ */ #ifndef _XP_MACROS_H_ @@ -111,10 +111,4 @@ #define XP_Q(val) XP_WQ(val) #endif -/* compiler-specific macros */ -#ifndef _WIN32 - #define __declspec(x) -#endif - - #endif