*** empty log message ***

ase/awk/makefile.sol.gcc

@@ -1,44 +0,0 @@
-OUT = aseawk
-
-C_SRCS = awk.c err.c tree.c str.c tab.c map.c parse.c \
-	run.c rec.c val.c func.c misc.c extio.c rex.c
-JNI_SRCS = jni.c
-JAVA_SRCS = Exception.java Extio.java Awk.java StdAwk.java
-
-C_OBJS = $(C_SRCS:.c=.o)
-JNI_OBJS = $(JNI_SRCS:.c=.o)
-JAVA_OBJS = $(JAVA_SRCS:.java=.class)
-
-JNI_INCPATH= \
-	-I"$(JAVA_HOME)/include" \
-	-I"$(JAVA_HOME)/include/solaris"
-
-CC = gcc
-AR = ar
-LD = ld
-RANLIB = ranlib
-CFLAGS = -Wall -O2 -D_REENTRANT -D_THREAD_SAFE -fPIC -I../.. $(JNI_INCPATH)
-LDFLAGS = 
-LIBS = 
-
-JAVAC = javac
-JAVACFLAGS = -classpath ../..
-
-all: lib jni
-
-lib: $(C_OBJS)
-	$(AR) cr lib$(OUT).a $(C_OBJS)
-
-jni: lib $(JNI_OBJS) $(JAVA_OBJS)
-	$(CC) -shared -o $(OUT)_jni.so $(JNI_OBJS) -lm -L. -l$(OUT)
-
-clean:
-	rm -rf $(C_OBJS) $(JNI_OBJS) $(JAVA_OBJS) lib$(OUT).a lib$(OUT).so *.o
-
-.SUFFIXES: .c .o .java .class
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-
-.java.class:
-	$(JAVAC) $(JAVACFLAGS) $<
-

ase/awk/makefile.sol64.gcc

@@ -1,44 +0,0 @@
-OUT = aseawk
-
-C_SRCS = awk.c err.c tree.c str.c tab.c map.c parse.c \
-	run.c rec.c val.c func.c misc.c extio.c rex.c
-JNI_SRCS = jni.c
-JAVA_SRCS = Exception.java Extio.java Awk.java StdAwk.java
-
-C_OBJS = $(C_SRCS:.c=.o)
-JNI_OBJS = $(JNI_SRCS:.c=.o)
-JAVA_OBJS = $(JAVA_SRCS:.java=.class)
-
-JNI_INCPATH= \
-	-I"$(JAVA_HOME)/include" \
-	-I"$(JAVA_HOME)/include/solaris"
-
-CC = gcc
-AR = ar
-LD = ld
-RANLIB = ranlib
-CFLAGS = -m64 -Wall -O2 -D_REENTRANT -D_THREAD_SAFE -fPIC -I../.. $(JNI_INCPATH)
-LDFLAGS = 
-LIBS = 
-
-JAVAC = javac
-JAVACFLAGS = -classpath ../..
-
-all: lib jni
-
-lib: $(C_OBJS)
-	$(AR) cr lib$(OUT).a $(C_OBJS)
-
-jni: lib $(JNI_OBJS) $(JAVA_OBJS)
-	$(CC) -shared -o $(OUT)_jni.so $(JNI_OBJS) -lm -L. -l$(OUT)
-
-clean:
-	rm -rf $(C_OBJS) $(JNI_OBJS) $(JAVA_OBJS) lib$(OUT).a lib$(OUT).so *.o
-
-.SUFFIXES: .c .o .java .class
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-
-.java.class:
-	$(JAVAC) $(JAVACFLAGS) $<
-

ase/awk/rex.c

@@ -1,5 +1,5 @@
 /*
- * $Id: rex.c,v 1.66 2007-02-23 08:17:49 bacon Exp $
+ * $Id: rex.c,v 1.67 2007-02-23 10:33:20 bacon Exp $
  *
  * {License}
  */
@@ -139,13 +139,13 @@ typedef const ase_byte_t* (*atom_matcher_t) (
 #define ADD_CODE(rex,data,len) \
 	do { if (__add_code(rex,data,len) == -1) return -1; } while (0)
 
-#if defined(__sparc) || defined(__sparc__)
+/* #if defined(__sparc) || defined(__sparc__)
 	#define GET_CODE(rex,pos,type) __get_code(rex,pos)
 	#define SET_CODE(rex,pos,type,code) __set_code(rex,pos,code)
-#else
+#else */
 	#define GET_CODE(rex,pos,type) (*((type*)&(rex)->code.buf[pos]))
 	#define SET_CODE(rex,pos,type,code) (GET_CODE(rex,pos,type) = (code))
-#endif
+/* #endif */
 
 static int __build_pattern (__builder_t* rex);
 static int __build_pattern0 (__builder_t* rex);

ase/doc/quickstart-en.man

@@ -31,3 +31,12 @@ SCO OpenServer Release 5.0.7 (SCO_SV 3.2 5.0.7)
 
 cc
 CC=cc CFLAGS="-Xc -a ansi -O2" ./configure
+
+=== Solaris ===
+
+64 bit gcc
+
+CC=gcc CFLAGS="-Wall -O2 -m64" LDFLAGS="-m64" ./configure
+
+32 bit gcc
+CC=gcc CFLAGS="-Wall -O2" ./configure

ase/pack.h

@@ -1,11 +1,11 @@
 /*
- * $Id: pack.h,v 1.4 2007-02-19 06:13:03 bacon Exp $
+ * $Id: pack.h,v 1.5 2007-02-23 10:33:20 bacon Exp $
  *
  * {License}
  */
 
 #if defined(__GNUC__)
-	#pragma pack(push,1)
+	#pragma pack(1)
 #elif defined(__HP_aCC) || defined(__HP_cc)
 	#pragma PACK 1
 #elif defined(_MSC_VER) || defined(__BORLANDC__)

ase/test/awk/makefile.sol.gcc

@@ -1,25 +0,0 @@
-SRCS = awk.c
-OBJS = $(SRCS:.c=.o)
-
-CC = gcc
-CFLAGS = -O2 -Wall -D_REENTRANT -D_THREAD_SAFE -fPIC -I../../..
-LDFLAGS =  -L../../awk
-LIBS =  -laseawk -lm
-
-all: awk
-
-awk: $(OBJS)
-	$(CC) -o $@ awk.o $(LDFLAGS) $(LIBS)
-
-java:
-	javac -classpath ../../.. Awk.java AwkApplet.java
-
-jrun:
-	java -Xms1m -Xmx2m -classpath ../../.. ase.test.awk.Awk
-
-clean:
-	rm -rf *.o *.class awk 
-
-.SUFFIXES: .c .o
-.c.o:
-	$(CC) -c $(CFLAGS) $<

ase/test/awk/makefile.sol64.gcc

@@ -1,25 +0,0 @@
-SRCS = awk.c
-OBJS = $(SRCS:.c=.o)
-
-CC = gcc
-CFLAGS = -m64 -O2 -Wall -D_REENTRANT -D_THREAD_SAFE -fPIC -I../../..
-LDFLAGS =  -L../../awk
-LIBS =  -laseawk -lm
-
-all: awk
-
-awk: $(OBJS)
-	$(CC) -o $@ awk.o $(LDFLAGS) $(LIBS)
-
-java:
-	javac -classpath ../../.. Awk.java AwkApplet.java
-
-jrun:
-	java -Xms1m -Xmx2m -classpath ../../.. ase.test.awk.Awk
-
-clean:
-	rm -rf *.o *.class awk 
-
-.SUFFIXES: .c .o
-.c.o:
-	$(CC) -c $(CFLAGS) $<

ase/unpack.h

@@ -1,11 +1,11 @@
 /*
- * $Id: unpack.h,v 1.4 2007-02-19 06:13:03 bacon Exp $
+ * $Id: unpack.h,v 1.5 2007-02-23 10:33:20 bacon Exp $
  *
  * {License}
  */
 
 #if defined(__GNUC__)
-	#pragma pack(pop)
+	#pragma pack()
 #elif defined(__HP_aCC) || defined(__HP_cc)
 	#pragma PACK
 #elif defined(__MSC_VER) || defined(__BORLANDC__)

ase/utl/stdio.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdio.c,v 1.3 2007-02-20 14:23:18 bacon Exp $
+ * $Id: stdio.c,v 1.4 2007-02-23 10:33:20 bacon Exp $
  *
  * {License}
  */
@@ -209,7 +209,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format)
 		}
 		else 
 		{
-			while (ase_isdigit(ch)) 
+			while (ase_isdigit(ASE_NULL, ch)) 
 			{
 				ADDC (buf, ch);
 				ch = *fp++;
@@ -229,7 +229,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format)
 			}
 			else 
 			{
-				while (ase_isdigit(ch)) 
+				while (ase_isdigit(ASE_NULL, ch)) 
 				{
 					ADDC (buf, ch);
 					ch = *fp++;
@@ -267,7 +267,7 @@ static ase_char_t* __adjust_format (const ase_char_t* format)
 	#ifdef ASE_CHAR_IS_MCHAR
 			ADDC (buf, 'l');
 	#endif
-			ADDC (buf, ase_tolower(ch));
+			ADDC (buf, ase_tolower(ASE_NULL, ch));
 #endif
 		}
 		else if (ch == ASE_T('d') || ch == ASE_T('i') ||