From c7dc0bfa81a0d68dc5463e47bd74f21c1f066ca1 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 22 Mar 2008 05:57:29 +0000 Subject: [PATCH] --- ase/awk/StdAwk.cpp | 6 +++++- ase/awk/run.c | 6 +++--- ase/cmd/awk/awk.c | 2 +- ase/cmn/types.h | 7 +++++-- ase/doc/en/quickstart.man | 19 ++++++++++++++++--- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ase/awk/StdAwk.cpp b/ase/awk/StdAwk.cpp index 9a817ccb..7d9d96f5 100644 --- a/ase/awk/StdAwk.cpp +++ b/ase/awk/StdAwk.cpp @@ -1,9 +1,13 @@ /* - * $Id: StdAwk.cpp 115 2008-03-03 11:13:15Z baconevi $ + * $Id: StdAwk.cpp 152 2008-03-21 11:57:29Z baconevi $ * * {License} */ +#if defined(hpux) || defined(__hpux) || defined(__hpux__) + #define _INCLUDE__STDC_A1_SOURCE +#endif + #include #include #include diff --git a/ase/awk/run.c b/ase/awk/run.c index bce870a4..abd0f009 100644 --- a/ase/awk/run.c +++ b/ase/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c 115 2008-03-03 11:13:15Z baconevi $ + * $Id: run.c 152 2008-03-21 11:57:29Z baconevi $ * * {License} */ @@ -601,9 +601,9 @@ void* ase_awk_getruncustomdata (ase_awk_run_t* run) return run->custom_data; } -ase_map_t* ase_awk_getrunnamedvarmap (ase_awk_run_t* awk) +ase_map_t* ase_awk_getrunnamedvarmap (ase_awk_run_t* run) { - return awk->named; + return run->named; } int ase_awk_run (ase_awk_t* awk, diff --git a/ase/cmd/awk/awk.c b/ase/cmd/awk/awk.c index b3c51e4e..0cd03860 100644 --- a/ase/cmd/awk/awk.c +++ b/ase/cmd/awk/awk.c @@ -852,7 +852,7 @@ static void on_run_start (ase_awk_run_t* run, void* custom) static int print_awk_value (ase_pair_t* pair, void* arg) { ase_awk_run_t* run = (ase_awk_run_t*)arg; - local_dprintf (ASE_T("%.*s = "), pair->key.len, pair->key.ptr); + local_dprintf (ASE_T("%.*s = "), (int)pair->key.len, pair->key.ptr); ase_awk_dprintval (run, (ase_awk_val_t*)pair->val); local_dprintf (ASE_T("\n")); return 0; diff --git a/ase/cmn/types.h b/ase/cmn/types.h index 9c1edf36..a895a379 100644 --- a/ase/cmn/types.h +++ b/ase/cmn/types.h @@ -1,5 +1,5 @@ /* - * $Id: types.h 151 2008-03-21 04:33:35Z baconevi $ + * $Id: types.h 152 2008-03-21 11:57:29Z baconevi $ * * {License} */ @@ -35,7 +35,10 @@ typedef int ase_tri_t; #define ase_dead -1 /* integer that can hold a pointer */ -#if defined(__SPU__) && (ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG) +#if (defined(hpux) || defined(__hpux) || defined(__hpux__)) && (ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG) + typedef long ase_int_t; + typedef unsigned long ase_uint_t; +#elif defined(__SPU__) && (ASE_SIZEOF_VOID_P == ASE_SIZEOF_LONG) typedef long ase_int_t; typedef unsigned long ase_uint_t; #elif ASE_SIZEOF_VOID_P == ASE_SIZEOF_INT diff --git a/ase/doc/en/quickstart.man b/ase/doc/en/quickstart.man index 379bdb64..d0d965ae 100644 --- a/ase/doc/en/quickstart.man +++ b/ase/doc/en/quickstart.man @@ -61,14 +61,27 @@ The following table shows the output locations of generated files. If you have preference for a particular compiler and the flags, you may explicitly specify them when you run the [[configure]] script. Here are presented a few such examples. +{{| +! +! 32 Bits +! 64 Bits +|- +| HP-UX B.11.23 (PA-RISC) +| ./configure -build=hppa-hp-hpux +| ./configure -build=hppa64-hp-hpux +| HP-UX B.11.23 (IA64) +| ./configure -build=ia64-hp-hpux +| ./configure -build=ia64-hp-hpux +|}} + {{| ! ! 32 Bits ! 64 Bits |- | HP-UX B.11.23 -| CC=cc CFLAGS="-O2 +DD32 -D_INCLUDE__STDC_A1_SOURCE" LDFLAGS="+DD32" CXX=aCC CXXFLAGS="-O2 +DD32 -D_INCLUDE__STDC_A1_SOURCE" ./configure -| CC=cc CFLAGS="-O2 +DD64 -D_INCLUDE__STDC_A1_SOURCE" LDFLAGS="+DD64" CXX=aCC CXXFLAGS="-O2 +DD64 -D_INCLUDE__STDC_A1_SOURCE" ./configure +| CC=cc CFLAGS="-O2 +DD32" LDFLAGS="+DD32" CXX=aCC CXXFLAGS="-O2 +DD32" ./configure +| CC=cc CFLAGS="-O2 +DD64" LDFLAGS="+DD64" CXX=aCC CXXFLAGS="-O2 +DD64" ./configure |- | SCO OpenServer 5.0.7 | CC=cc CFLAGS="-Xc -a ansi -O2" ./configure @@ -84,7 +97,7 @@ If you have preference for a particular compiler and the flags, you may explicit |- | CellSDK 3.0 | CC=ppu-gcc CXX=ppu-g++ RANLIB=ppu-ranlib AR=ppu-ar CFLAGS="-m64 -mabi=altivec -maltivec" CXXFLAGS="-m64 -mabi=altivec -maltivec" ./configure --host=ppc64 -| CC=spu-gcc CXX=spu-g++ RANLIB=spu-ranlib AR=spu-ar /configure --host=ppc +| CC=spu-gcc CXX=spu-g++ RANLIB=spu-ranlib AR=spu-ar ./configure --host=ppc |}} The JNI library for JAVA is built automatically if required JNI header files are detected by the [[configure]] script. Make sure that the [[javac]] command is included in the [[PATH]] environment variable. The JAVA class files are built with the [[javac]] command detected as well. The {ant,http://ant.apache.org} utility from the Apache Software Foundataion can be used to build the java class files. The [[build.xml]] file is provided at the top-level directory.