This commit was manufactured by cvs2svn to create tag 'V1_186'.

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/tags/V1_186@14805 87f5fb63-7c3d-0410-a384-fd976d0f7a62
2025-12-08 14:59:05 +00:00 · 2005-01-14 09:07:18 +00:00
966 changed files with 12878 additions and 47793 deletions
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.101 2007-01-06 10:09:48 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.20 2005-01-14 09:07:16 obarthel Exp $
 #
 # :ts=8
 #
@@ -12,7 +12,7 @@ RANLIB = ranlib
 COPY = copy clone buf=0
 DELETE = delete all quiet
 MAKEDIR = makedir
-MAKE = $(MAKE_COMMAND) -f GNUmakefile.68k
+MAKE = make -f GNUmakefile.68k

 ##############################################################################

@@ -21,6 +21,7 @@ LIBC_OBJS	= libc_objs
 LIBUNIX_OBJS	= libunix_objs
 LIBM_OBJS	= libm_objs
 LIBM881_OBJS	= libm881_objs
+LIBSTACK_OBJS	= libstack_objs
 LIBNET_OBJS	= libnet_objs
 LIBDEBUG_OBJS	= libdebug_objs
 LIBAMIGA_OBJS	= libamiga_objs
@@ -29,6 +30,7 @@ LIBC_OBJS	= $(TYPE)/libc_objs
 LIBUNIX_OBJS	= $(TYPE)/libunix_objs
 LIBM_OBJS	= $(TYPE)/libm_objs
 LIBM881_OBJS	= $(TYPE)/libm881_objs
+LIBSTACK_OBJS	= $(TYPE)/libstack_objs
 LIBNET_OBJS	= $(TYPE)/libnet_objs
 LIBDEBUG_OBJS	= $(TYPE)/libdebug_objs
 LIBAMIGA_OBJS	= $(TYPE)/libamiga_objs
@@ -56,6 +58,10 @@ $(LIBM881_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m881]"
 	@$(CC) -o $(LIBM881_OBJS)/$*.o -c $(CFLAGS) -DM68881_FLOATING_POINT_SUPPORT -m68881 $<

+$(LIBSTACK_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):stack]"
+	@$(CC) -o $(LIBSTACK_OBJS)/$*.o -c $(CFLAGS) -DSTACK_EXTENSION $<
+
 $(LIBNET_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):net]"
 	@$(CC) -o $(LIBNET_OBJS)/$*.o -c $(CFLAGS) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT $<
@@ -71,51 +77,42 @@ $(LIBAMIGA_OBJS)/%.o : %.c
 ##############################################################################

 ifeq (small_data_020,$(TYPE))
-CODE_TYPE	:= -m68020-60
-CODE_FLAGS	:= -fbaserel -DSMALL_DATA -DM68020 -DUSE_64_BIT_INTS
+CODE_TYPE := -fbaserel -DSMALL_DATA -m68020-60 -DM68020
 endif

 ifeq (small_data,$(TYPE))
-CODE_TYPE	:= -m68000
-CODE_FLAGS	:= -fbaserel -DSMALL_DATA
+CODE_TYPE := -fbaserel -DSMALL_DATA -m68000
 endif

 ifeq (small_data32,$(TYPE))
-CODE_TYPE	:= -m68020-60
-CODE_FLAGS	:= -fbaserel32 -DSMALL_DATA32 -DM68020 -DUSE_64_BIT_INTS
+CODE_TYPE := -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020
 endif

 ifeq (large_data_020,$(TYPE))
-CODE_TYPE	:= -m68020-60
-CODE_FLAGS	:= -DM68020 -DUSE_64_BIT_INTS
+CODE_TYPE := -m68020-60 -DM68020
 endif

 ifeq (large_data,$(TYPE))
-CODE_TYPE	:= -m68000
-CODE_FLAGS	:=
+CODE_TYPE := -m68000
 endif

 ##############################################################################

 WARNINGS = \
 	-Wall -W -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wunused
+	-Wundef -Wbad-function-cast -Wmissing-declarations

 #	-Wconversion -Wshadow

 INCLUDES = -Iinclude -I. -Inetinclude
-#OPTIONS = -fno-builtin -fno-common -DDEBUG
- OPTIONS = -fno-builtin -fno-common -DNDEBUG
-#OPTIONS = -fno-builtin -fno-common -DNDEBUG -D__THREAD_SAFE
-#OPTIONS = -fno-builtin -fno-common -D__MEM_DEBUG
-#OPTIONS = -fno-builtin -fno-common -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG
- OPTIMIZE = -O -fomit-frame-pointer -fstrength-reduce -finline-functions
+ OPTIONS = -DNDEBUG -fno-builtin
+#OPTIONS = -D__MEM_DEBUG -fno-builtin
+#OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
+#OPTIMIZE = -O -fomit-frame-pointer -fstrength-reduce -finline-functions
 #OPTIMIZE = -O2 -fomit-frame-pointer
-#DEBUG = -g
+#DEBUG = -g2

-CFLAGS = \
-	$(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) \
-	$(CODE_FLAGS) $(CODE_TYPE) $(INCLUDES)
+CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)

 ##############################################################################

@@ -124,7 +121,6 @@ C_LIB = \
 	ctype_isalnum.o \
 	ctype_isalpha.o \
 	ctype_isascii.o \
-	ctype_isblank.o \
 	ctype_iscntrl.o \
 	ctype_isdigit.o \
 	ctype_isgraph.o \
@@ -134,34 +130,27 @@ C_LIB = \
 	ctype_isspace.o \
 	ctype_isupper.o \
 	ctype_isxdigit.o \
-	ctype_table.o \
 	ctype_tolower.o \
 	ctype_toupper.o \
+	ctype_table.o \
 	dirent_closedir.o \
+	dirent_data.o \
+	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
-	dirent_rewinddir.o \
 	errno_data.o \
 	fcntl_close.o \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
-	fcntl_get_default_file.o \
-	fcntl_lock.o \
 	fcntl_lseek.o \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
-	ftw_ftw.o \
-	ftw_nftw.o \
-	inttypes_imaxdiv.o \
-	inttypes_imaxabs.o \
-	inttypes_strtoimax.o \
-	inttypes_strtoumax.o \
+	fcntl_get_default_file.o \
 	libgen_basename.o \
 	libgen_dirname.o \
 	locale_init_exit.o \
 	locale_localeconv.o \
-	locale_open_locale.o \
 	locale_setlocale.o \
 	mount_convertinfo.o \
 	mount_fstatfs.o \
@@ -169,7 +158,6 @@ C_LIB = \
 	signal_checkabort.o \
 	signal_data.o \
 	signal_kill.o \
-	signal_mask.o \
 	signal_raise.o \
 	signal_sigaddset.o \
 	signal_sigblock.o \
@@ -180,35 +168,31 @@ C_LIB = \
 	signal_sigsetmask.o \
 	stat_chmod.o \
 	stat_convertfileinfo.o \
+	stat_data.o \
 	stat_fchmod.o \
 	stat_fstat.o \
 	stat_lstat.o \
-	stat_lock.o \
 	stat_mkdir.o \
 	stat_rmdir.o \
 	stat_stat.o \
 	stat_umask.o \
 	stdio_asprintf.o \
-	stdio_change_fd_action.o \
-	stdio_change_fd_user_data.o \
 	stdio_clearerr.o \
+	stdio_data.o \
 	stdio_dropiobreadbuffer.o \
 	stdio_duplicate_fd.o \
-	stdio_examine_fh.o \
 	stdio_fclose.o \
 	stdio_fdhookentry.o \
 	stdio_feof.o \
 	stdio_ferror.o \
 	stdio_fflush.o \
+	stdio_flush.o \
 	stdio_fgetc.o \
 	stdio_fgetpos.o \
 	stdio_fgets.o \
 	stdio_filliobreadbuffer.o \
 	stdio_findvacantfdentry.o \
 	stdio_findvacantiobentry.o \
-	stdio_flockfile.o \
-	stdio_flush.o \
-	stdio_flush_all_files.o \
 	stdio_flushiobwritebuffer.o \
 	stdio_fopen.o \
 	stdio_fprintf.o \
@@ -218,45 +202,30 @@ C_LIB = \
 	stdio_freopen.o \
 	stdio_fscanf.o \
 	stdio_fseek.o \
-	stdio_fseeko.o \
 	stdio_fsetpos.o \
 	stdio_ftell.o \
-	stdio_ftello.o \
-	stdio_ftrylockfile.o \
-	stdio_funlockfile.o \
 	stdio_fwrite.o \
 	stdio_getc.o \
-	stdio_getc_unlocked.o \
 	stdio_getchar.o \
-	stdio_getchar_unlocked.o \
-	stdio_gets.o \
-	stdio_get_fd.o \
 	stdio_get_file_descriptor.o \
+	stdio_gets.o \
 	stdio_growfdtable.o \
 	stdio_growiobtable.o \
-	stdio_grow_file.o \
 	stdio_initializefd.o \
 	stdio_initializeiob.o \
 	stdio_init_exit.o \
-	stdio_file_init.o \
 	stdio_iobhookentry.o \
-	stdio_lock.o \
 	stdio_locksemaphorename.o \
 	stdio_nostdio.o \
 	stdio_openiob.o \
-	stdio_parent_of_fh.o \
 	stdio_perror.o \
 	stdio_popen.o \
 	stdio_printf.o \
 	stdio_putc.o \
-	stdio_putc_unlocked.o \
 	stdio_putchar.o \
-	stdio_putchar_unlocked.o \
 	stdio_puts.o \
 	stdio_remove.o \
-	stdio_remove_fd_alias.o \
 	stdio_rename.o \
-	stdio_resolve_fd_file.o \
 	stdio_rewind.o \
 	stdio_scanf.o \
 	stdio_setbuf.o \
@@ -269,7 +238,6 @@ C_LIB = \
 	stdio_tmpnam.o \
 	stdio_translateioerror.o \
 	stdio_ungetc.o \
-	stdio_unlockfile.o \
 	stdio_vasprintf.o \
 	stdio_vasprintf_hook_entry.o \
 	stdio_vfprintf.o \
@@ -279,23 +247,20 @@ C_LIB = \
 	stdio_vsnprintf_hook_entry.o \
 	stdio_vsprintf.o \
 	stdio_vsprintf_hook_entry.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
 	stdlib_abort.o \
 	stdlib_abs.o \
 	stdlib_alloca.o \
-	stdlib_alloca_cleanup.o \
-	stdlib_alloca_trap.o \
 	stdlib_assertion_failure.o \
 	stdlib_atexit.o \
 	stdlib_atoi.o \
 	stdlib_atol.o \
-	stdlib_atoll.o \
 	stdlib_bsearch.o \
 	stdlib_calloc.o \
 	stdlib_checkdetach.o \
 	stdlib_constructor.o \
 	stdlib_constructor_begin.o \
+	stdlib_constructor_end.o \
+	stdlib_data.o \
 	stdlib_default_pool_size.o \
 	stdlib_default_puddle_size.o \
 	stdlib_destructor.o \
@@ -309,19 +274,12 @@ C_LIB = \
 	stdlib_free.o \
 	stdlib_getdefstacksize.o \
 	stdlib_getenv.o \
-	stdlib_getmemstats.o \
 	stdlib_getsp.o \
-	stdlib_get_errno.o \
+	stdlib_init_exit.o \
 	stdlib_isresident.o \
 	stdlib_labs.o \
-	stdlib_llabs.o \
 	stdlib_ldiv.o \
-	stdlib_lldiv.o \
-	stdlib_lib_main.o \
-	stdlib_lib_startup.o \
 	stdlib_machine_test.o \
-	stdlib_main.o \
-	stdlib_main_stub.o \
 	stdlib_malloc.o \
 	stdlib_math.o \
 	stdlib_mkdtemp.o \
@@ -334,21 +292,17 @@ C_LIB = \
 	stdlib_oslibversion.o \
 	stdlib_priority.o \
 	stdlib_process_name.o \
-	stdlib_program_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
-	stdlib_rand_r.o \
 	stdlib_realloc.o \
 	stdlib_red_black.o \
-	stdlib_resetmemstats.o \
-	stdlib_semaphore.o \
 	stdlib_setenv.o \
 	stdlib_setjmp.o \
-	stdlib_set_errno.o \
 	stdlib_set_process_window.o \
 	stdlib_shell_escape.o \
 	stdlib_showerror.o \
+	stdlib_socket.o \
 	stdlib_srand.o \
 	stdlib_stackargbytes.o \
 	stdlib_stackcheck.o \
@@ -356,23 +310,22 @@ C_LIB = \
 	stdlib_stacksafezone.o \
 	stdlib_stacksize.o \
 	stdlib_stack_usage.o \
-	stdlib_arg.o \
-	stdlib_stdio_window_spec.o \
+	stdlib_startup.o \
 	stdlib_strtol.o \
-	stdlib_strtoll.o \
 	stdlib_strtoul.o \
+	stdlib_strtoll.o \
 	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_sysbase.o \
 	stdlib_system.o \
 	stdlib_termination_message.o \
 	stdlib_threshold.o \
-	stdlib_utilitybase.o \
 	stdlib_udivsi3.o \
 	stdlib_udivsi4.o \
 	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
-	strings_ffs.o \
+	stdlib_wildcard_expand.o \
+	stdlib_stdio_window_spec.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -393,7 +346,6 @@ C_LIB = \
 	string_strcspn.o \
 	string_strdup.o \
 	string_strerror.o \
-	string_strerror_r.o \
 	string_strlcat.o \
 	string_strlcpy.o \
 	string_strlen.o \
@@ -411,12 +363,9 @@ C_LIB = \
 	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
-	time_convert_datestamp.o \
-	time_convert_time.o \
 	time_ctime.o \
 	time_ctime_r.o \
 	time_data.o \
-	time_days_per_date.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
 	time_gmtime_r.o \
@@ -426,10 +375,6 @@ C_LIB = \
 	time_numbertostring.o \
 	time_strftime.o \
 	time_time.o \
-	time_weekday.o \
-	uio_readv.o \
-	uio_writev.o \
-	ulimit_ulimit.o \
 	unistd_access.o \
 	unistd_chdir.o \
 	unistd_chdir_exit.o \
@@ -438,10 +383,8 @@ C_LIB = \
 	unistd_dup.o \
 	unistd_dup2.o \
 	unistd_fchown.o \
-	unistd_fdatasync.o \
 	unistd_fdopen.o \
 	unistd_fileno.o \
-	unistd_fsync.o \
 	unistd_ftruncate.o \
 	unistd_getcwd.o \
 	unistd_getopt.o \
@@ -450,24 +393,21 @@ C_LIB = \
 	unistd_isatty.o \
 	unistd_lchown.o \
 	unistd_link.o \
-	unistd_lockf.o \
 	unistd_readlink.o \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_sync_fd.o \
 	unistd_timer.o \
 	unistd_time_delay.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
-	unistd_unlink_retries.o \
 	unistd_usleep.o \
-	utime_utime.o \
-	utsname_uname.o
+	utime_utime.o

 UNIX_LIB = \
 	unix.lib_rev.o \
 	dirent_closedir.o \
+	dirent_data.o \
 	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
@@ -475,249 +415,81 @@ UNIX_LIB = \
 	fcntl_fcntl.o \
 	fcntl_open.o \
 	fcntl_get_default_file.o \
-	getopt_getopt_long.o \
 	mount_convertinfo.o \
 	mount_statfs.o \
-	resource_getrlimit.o \
-	resource_setrlimit.o \
 	stat_chmod.o \
 	stat_fstat.o \
 	stat_lstat.o \
-	stat_lock.o \
 	stat_mkdir.o \
 	stat_rmdir.o \
 	stat_stat.o \
-	stdio_ctermid.o \
 	stdio_fdhookentry.o \
 	stdio_fflush.o \
 	stdio_fopen.o \
 	stdio_init_exit.o \
-	stdio_file_init.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
 	stdio_popen.o \
-	stdio_record_locking.o \
 	stdio_remove.o \
 	stdio_rename.o \
-	stdlib_alloca.o \
-	stdlib_alloca_cleanup.o \
-	stdlib_alloca_trap.o \
-	stdlib_arg.o \
-	stdlib_expand_wildcard.o \
-	stdlib_expand_wildcard_check.o \
-	stdlib_getmemstats.o \
-	stdlib_main.o \
-	stdlib_main_stub.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
-	stdlib_malloc.o \
-	stdlib_realloc.o \
-	stdlib_resetmemstats.o \
 	stdlib_system.o \
-	systeminfo_sysinfo.o \
-	termios_cfgetispeed.o \
-	termios_cfgetospeed.o \
-	termios_cfmakeraw.o \
-	termios_cfsetispeed.o \
-	termios_cfsetospeed.o \
-	termios_console_fdhookentry.o \
-	termios_tcdrain.o \
-	termios_tcflow.o \
-	termios_tcflush.o \
-	termios_tcgetattr.o \
-	termios_tcsendbreak.o \
-	termios_tcsetattr.o \
-	timeb_ftime.o \
-	uio_readv.o \
-	uio_writev.o \
 	unistd_access.o \
 	unistd_chdir.o \
 	unistd_chdir_exit.o \
 	unistd_chown.o \
-	unistd_common_pathconf.o \
-	unistd_def_path.o \
-	unistd_def_path_delimiter.o \
-	unistd_environ.o \
-	unistd_execl.o \
-	unistd_execle.o \
-	unistd_execlp.o \
-	unistd_execv.o \
-	unistd_execve.o \
-	unistd_execve_env_exit.o \
-	unistd_execve_env_init.o \
-	unistd_execve_exit.o \
-	unistd_execvp.o \
-	unistd_fpathconf.o \
 	unistd_getcwd.o \
 	unistd_lchown.o \
 	unistd_link.o \
-	unistd_lockf.o \
-	unistd_pathconf.o \
 	unistd_readlink.o \
 	unistd_realpath.o \
 	unistd_restorepathname.o \
 	unistd_setcurrentpath.o \
 	unistd_strip_double_slash.o \
-	unistd_symlink.o \
 	unistd_translatea2u.o \
 	unistd_translaterel.o \
 	unistd_translateu2a.o \
 	unistd_truncate.o \
-	unistd_ttyname.o \
-	unistd_ttyname_r.o \
 	unistd_unix_path_semantics.o \
 	unistd_unlink.o \
 	unistd_wildcard_expand.o \
 	utime_utime.o

 MATH_LIB = \
-	complex_carg.o \
-	complex_cargf.o \
-	complex_cargl.o \
-	complex_cimag.o \
-	complex_cimagf.o \
-	complex_cimagl.o \
-	complex_conj.o \
-	complex_conjf.o \
-	complex_conjl.o \
-	complex_creal.o \
-	complex_crealf.o \
-	complex_creall.o \
-	fenv_feclearexcept.o \
-	fenv_fegetenv.o \
-	fenv_fegetexceptflag.o \
-	fenv_fegetround.o \
-	fenv_feholdexcept.o \
-	fenv_feraiseexcept.o \
-	fenv_fesetenv.o \
-	fenv_fesetexceptflag.o \
-	fenv_fetestexcept.o \
-	fenv_fetestround.o \
-	fenv_feupdateenv.o \
 	math_acos.o \
-	math_acosf.o \
-	math_acosh.o \
-	math_acoshf.o \
 	math_asin.o \
-	math_asinf.o \
-	math_asinh.o \
-	math_asinhf.o \
 	math_atan.o \
 	math_atan2.o \
-	math_atan2f.o \
-	math_atanf.o \
-	math_atanh.o \
-	math_atanhf.o \
-	math_cbrt.o \
-	math_cbrtf.o \
 	math_ceil.o \
-	math_ceilf.o \
-	math_copysign.o \
-	math_copysignf.o \
 	math_cos.o \
-	math_cosf.o \
 	math_cosh.o \
-	math_coshf.o \
-	math_erf.o \
-	math_erfc.o \
-	math_erfcf.o \
-	math_erff.o \
+	math_data.o \
 	math_exp.o \
-	math_exp2.o \
-	math_exp2f.o \
-	math_expf.o \
-	math_expm1.o \
-	math_expm1f.o \
 	math_fabs.o \
-	math_fabsf.o \
-	math_fdim.o \
-	math_fdimf.o \
 	math_floor.o \
-	math_floorf.o \
-	math_fma.o \
-	math_fmaf.o \
-	math_fmax.o \
-	math_fmaxf.o \
-	math_fmin.o \
-	math_fminf.o \
 	math_fmod.o \
-	math_fmodf.o \
-	math_fpclassify.o \
 	math_frexp.o \
-	math_frexpf.o \
-	math_huge_val.o \
-	math_huge_valf.o \
 	math_hypot.o \
-	math_hypotf.o \
-	math_ilogb.o \
-	math_ilogbf.o \
-	math_inf.o \
-	math_inff.o \
 	math_init_exit.o \
-	math_isfinite.o \
-	math_isunordered.o \
-	math_kernel_cosf.o \
-	math_kernel_sinf.o \
-	math_kernel_tanf.o \
+	math_isinf.o \
+	math_isnan.o \
 	math_ldexp.o \
-	math_ldexpf.o \
-	math_lgamma.o \
-	math_lgammaf.o \
-	math_llrint.o \
 	math_log.o \
 	math_log10.o \
-	math_log10f.o \
-	math_log1p.o \
-	math_log1pf.o \
-	math_log2.o \
-	math_log2f.o \
 	math_logb.o \
-	math_logbf.o \
-	math_logf.o \
-	math_lrint.o \
-	math_lrintf.o \
-	math_lround.o \
-	math_lroundf.o \
 	math_modf.o \
-	math_modff.o \
-	math_nan.o \
-	math_nanf.o \
-	math_nearbyint.o \
-	math_nearbyintf.o \
-	math_nextafter.o \
-	math_nextafterf.o \
 	math_pow.o \
-	math_powf.o \
-	math_remainder.o \
-	math_remainderf.o \
-	math_remquo.o \
-	math_remquof.o \
-	math_rem_pio2f.o \
 	math_rint.o \
 	math_rintf.o \
-	math_round.o \
-	math_roundf.o \
-	math_scalbn.o \
-	math_scalbnf.o \
-	math_signbit.o \
 	math_sin.o \
-	math_sinf.o \
 	math_sinh.o \
-	math_sinhf.o \
 	math_sqrt.o \
-	math_sqrtf.o \
 	math_tan.o \
-	math_tanf.o \
 	math_tanh.o \
-	math_tanhf.o \
-	math_tgamma.o \
-	math_tgammaf.o \
-	math_trunc.o \
-	math_truncf.o \
 	stdio_asprintf.o \
 	stdio_flush.o \
-	stdio_flush_all_files.o \
 	stdio_fprintf.o \
 	stdio_fscanf.o \
 	stdio_printf.o \
@@ -728,14 +500,12 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
 	stdlib_atof.o \
+	stdlib_machine_test.o \
 	stdlib_strtod.o \
-	stdlib_strtof.o \
 	time_difftime.o

 MATH_LIB_881 = \
@@ -776,12 +546,20 @@ MATH_LIB_IEEE = \
 	math_subsf3.o \
 	math_truncdfsf2.o

+STACK_LIB = \
+	stack.lib_rev.o \
+	stdlib_setjmp.o \
+	stdlib_stackextension.o \
+	stdlib_stackminframe.o \
+	stdlib_stackoverflow.o \
+	stdlib_stacksafezone.o
+
 NET_LIB = \
 	net.lib_rev.o \
 	socket_accept.o \
 	socket_bind.o \
-	socket_check_daemon.o \
 	socket_connect.o \
+	socket_data.o \
 	socket_gethostbyaddr.o \
 	socket_gethostbyname.o \
 	socket_gethostid.o \
@@ -807,13 +585,10 @@ NET_LIB = \
 	socket_ioctl.o \
 	socket_isdaemon.o \
 	socket_listen.o \
-	socket_obtain_daemon.o \
 	socket_recv.o \
 	socket_recvfrom.o \
 	socket_recvmsg.o \
-	socket_select_signal.o \
 	socket_select.o \
-	socket_wait_select.o \
 	socket_send.o \
 	socket_sendmsg.o \
 	socket_sendto.o \
@@ -822,10 +597,7 @@ NET_LIB = \
 	socket_socket.o \
 	socket_hook_entry.o \
 	socket_hstrerror.o \
-	socket_get_h_errno.o \
-	socket_set_h_errno.o \
 	stat_umask.o \
-	systeminfo_sysinfo.o \
 	usergroup_crypt.o \
 	usergroup_data.o \
 	usergroup_endgrent.o \
@@ -854,8 +626,7 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o \
-	utsname_uname.o
+	usergroup_setuid.o

 DEBUG_LIB = \
 	debug.lib_rev.o \
@@ -937,7 +708,7 @@ MEMDEBUG_LIB = \

 ##############################################################################

-LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBUNIX_OBJS)/libunix.a \
+LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
            $(LIBNET_OBJS)/libnet.a $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
            $(LIBM_OBJS)/libm.a
 LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
@@ -945,7 +716,7 @@ LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
 ##############################################################################

 # The 881 math library won't build in plain 68k mode
-ifneq (,$(findstring 68020,$(CODE_FLAGS)))
+ifneq (,$(findstring 68020,$(CODE_TYPE)))
 LIBS := $(LIBS_020)
 else
 LIBS := $(LIBS_68K)
@@ -953,7 +724,7 @@ endif

 ##############################################################################

-STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o
+STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o mainnb.o mainb.o mainb32.o

 ##############################################################################

@@ -963,6 +734,9 @@ all: \
 	lib/ncrt0.o \
 	lib/n32bcrt0.o \
 	lib/n32rcrt0.o \
+	lib/mainnb.o \
+	lib/mainb.o \
+	lib/mainb32.o \
 	lib/libm020/libm.a \
 	lib/libm.a \
 	lib/libb/libm.a \
@@ -974,7 +748,7 @@ all: \
 clean:
 	-$(DELETE) $(TYPE) $(LIBS_020) $(STARTUPS) \
 		$(LIBC_OBJS) $(LIBUNIX_OBJS) $(LIBM_OBJS) \
-		$(LIBM881_OBJS) $(LIBNET_OBJS) $(LIBDEBUG_OBJS) \
+		$(LIBM881_OBJS) $(LIBSTACK_OBJS) $(LIBNET_OBJS) $(LIBDEBUG_OBJS) \
 		$(LIBAMIGA_OBJS)

 realclean:
@@ -990,6 +764,7 @@ version:
 	copy clone c.lib_rev.rev m.lib_rev.rev
 	copy clone c.lib_rev.rev m881.lib_rev.rev
 	copy clone c.lib_rev.rev net.lib_rev.rev
+	copy clone c.lib_rev.rev stack.lib_rev.rev
 	copy clone c.lib_rev.rev unix.lib_rev.rev
 	bumprev 1 amiga.lib
 	bumprev 1 c.lib
@@ -997,6 +772,7 @@ version:
 	bumprev 1 m.lib
 	bumprev 1 m881.lib
 	bumprev 1 net.lib
+	bumprev 1 stack.lib
 	bumprev 1 unix.lib

 ##############################################################################
@@ -1037,38 +813,47 @@ lib/libm020 : lib

 lib/libb/libm020/libm.a: lib lib/libb/libm020
 	$(MAKE) TYPE=small_data_020 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020
+	$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020

 lib/libb/libm.a: lib lib/libb
 	$(MAKE) TYPE=small_data kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb
+	$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb

 lib/libb32/libm020/libm.a: lib lib/libb32 lib/libb32/libm020
 	$(MAKE) TYPE=small_data32 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020
+	$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020

 lib/libm020/libm.a: lib lib/libm020
 	$(MAKE) TYPE=large_data_020 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020
+	$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020

 lib/libm.a: lib
 	$(MAKE) TYPE=large_data kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib
+	$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib

 lib/nrcrt0.o : lib nrcrt0.o
-	@$(COPY) nrcrt0.o lib
+	$(COPY) nrcrt0.o lib

 lib/nbcrt0.o : lib nbcrt0.o
-	@$(COPY) nbcrt0.o lib
+	$(COPY) nbcrt0.o lib

 lib/ncrt0.o : lib ncrt0.o
-	@$(COPY) ncrt0.o lib
+	$(COPY) ncrt0.o lib

 lib/n32bcrt0.o : lib nb32crt0.o
-	@$(COPY) nb32crt0.o lib
+	$(COPY) nb32crt0.o lib

 lib/n32rcrt0.o : lib nr32crt0.o
-	@$(COPY) nr32crt0.o lib
+	$(COPY) nr32crt0.o lib
+
+lib/mainnb.o : lib mainnb.o
+	$(COPY) mainnb.o lib
+
+lib/mainb.o : lib mainb.o
+	$(COPY) mainb.o lib
+
+lib/mainb32.o : lib mainb32.o
+	$(COPY) mainb32.o lib

 ##############################################################################

@@ -1080,6 +865,8 @@ $(LIBC_OBJS)/stdlib_swapstack.o : stdlib_swapstack.c

 $(LIBC_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c

+$(LIBSTACK_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c
+
 ##############################################################################

 $(LIBC_OBJS)/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
@@ -1090,6 +877,8 @@ $(LIBM_OBJS)/m.lib_rev.o : m.lib_rev.c m.lib_rev.h

 $(LIBM881_OBJS)/m881.lib_rev.o : m881.lib_rev.c m881.lib_rev.h

+$(LIBSTACK_OBJS)/stack.lib_rev.o : stack.lib_rev.c stack.lib_rev.h
+
 $(LIBNET_OBJS)/net.lib_rev.o : net.lib_rev.c net.lib_rev.h

 $(LIBDEBUG_OBJS)/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
@@ -1100,46 +889,21 @@ $(LIBAMIGA_OBJS)/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h

 $(LIBC_OBJS)/stdlib_stacksize.o : stdlib_stacksize.c stdlib_gcc_help.h

-$(LIBC_OBJS)/stdlib_getdefstacksize.o : stdlib_getdefstacksize.c stdlib_gcc_help.h
-
 $(LIBC_OBJS)/stdlib_shell_escape.o : stdlib_shell_escape.c stdlib_gcc_help.h

-$(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_free.o : stdlib_free.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_free.o : stdlib_free.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_malloc.o : stdlib_malloc.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_init_exit.o : stdlib_init_exit.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_malloc.o : stdlib_malloc.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_mem_debug.h

-##############################################################################
-
-# The -fbaserel32 option requires the CPU type to be 68020, too.
-ifneq (,$(findstring fbaserel32,$(CODE_FLAGS)))
-LOCAL_CODE_FLAGS := $(CODE_FLAGS) $(CODE_TYPE)
-else
-LOCAL_CODE_FLAGS := $(CODE_FLAGS)
-endif
-
-$(LIBM881_OBJS)/math_init_exit.o : math_init_exit.c
-	@echo "Compiling $< [$(TYPE):m881]"
-	@$(CC) -o $(LIBM881_OBJS)/math_init_exit.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) -DM68881_FLOATING_POINT_SUPPORT $(INCLUDES) $<
-
-$(LIBC_OBJS)/stdlib_machine_test.o : stdlib_machine_test.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_machine_test.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
-
-$(LIBC_OBJS)/stdlib_showerror.o : stdlib_showerror.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_showerror.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
-
-$(LIBC_OBJS)/stdlib_main.o : stdlib_main.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_main.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) stdlib_main.c
+$(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h

 ##############################################################################

@@ -1229,6 +993,16 @@ $(LIBM881_OBJS)/libm881.a : $(LIBM881_OBJS) $(foreach file,$(MATH_LIB_881),$(LIB

 ##############################################################################

+$(LIBSTACK_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBSTACK_OBJS)/libstack.a : $(LIBSTACK_OBJS) $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
 $(LIBNET_OBJS) :
 	$(MAKEDIR) $@

@@ -1260,49 +1034,25 @@ $(LIBAMIGA_OBJS)/libamiga.a : $(LIBAMIGA_OBJS) $(foreach file,$(AMIGA_LIB),$(LIB
 ##############################################################################

 nrcrt0.o : nrcrt0.S
-	@echo "Assembling $< [resident]"
-	@$(CC) -traditional -o $@ -c nrcrt0.S
+	$(CC) -traditional -o $@ -c nrcrt0.S

 nr32crt0.o : nrcrt0.S
-	@echo "Assembling $< [resident32]"
-	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S
+	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S

 nbcrt0.o : ncrt0.S
-	@echo "Assembling $< [small_data]"
-	@$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S
+	$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S

 nb32crt0.o : ncrt0.S
-	@echo "Assembling $< [small_data32]"
-	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S
+	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S

 ncrt0.o : ncrt0.S
-	@echo "Assembling $< [large_data]"
-	@$(CC) -traditional -o $@ -c ncrt0.S
+	$(CC) -traditional -o $@ -c ncrt0.S

-##############################################################################
+mainb32.o : stdlib_main.c
+	$(CC) -o mainb32.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020 stdlib_main.c

-CONSTRUCTOR_FILES = \
-	amiga_rexxvars.c \
-	dirent_closedir.c \
-	locale_init_exit.c \
-	math_init_exit.c \
-	sas_profile.c \
-	socket_init_exit.c \
-	stdio_file_init.c \
-	stdio_init_exit.c \
-	stdlib_alloca.c \
-	stdlib_arg.c \
-	stdlib_malloc.c \
-	stdlib_program_name.c \
-	stdlib_setenv.c \
-	stdlib_stackcheck.c \
-	stdlib_stackextension.c \
-	time_clock.c \
-	unistd_chdir_exit.c \
-	unistd_init_exit.c \
-	unistd_timer.c \
-	unistd_wildcard_expand.c \
-	usergroup_init_exit.c
+mainb.o : stdlib_main.c
+	$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel -DSMALL_DATA -m68000 stdlib_main.c

-touch_constructor_files:
-	touch $(CONSTRUCTOR_FILES)
+mainnb.o : stdlib_main.c
+	$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
--- a/library/TODO
+++ b/library/TODO
@@ -1,5 +0,0 @@
-C99 math functions:
-
-	fma() and fmaf() should be implemented as a true "fused" multiply
-	and add function rather than the sequential operation implied in the
-	current implementation.
--- a/library/amiga.lib_rev.c
+++ b/library/amiga.lib_rev.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga.lib_rev.c,v 1.3 2006-01-08 12:04:21 obarthel Exp $
+ * $Id: amiga.lib_rev.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga.lib_rev.h
+++ b/library/amiga.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	202
-#define DATE		"16.1.2007"
-#define VERS		"amiga.lib 1.202"
-#define VSTRING		"amiga.lib 1.202 (16.1.2007)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.202 (16.1.2007)"
+#define REVISION	186
+#define DATE		"14.1.2005"
+#define VERS		"amiga.lib 1.186"
+#define VSTRING		"amiga.lib 1.186 (14.1.2005)\r\n"
+#define VERSTAG		"\0$VER: amiga.lib 1.186 (14.1.2005)"
--- a/library/amiga.lib_rev.rev
+++ b/library/amiga.lib_rev.rev
@@ -1 +1 @@
-202
+186
--- a/library/amiga_acrypt.c
+++ b/library/amiga_acrypt.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_acrypt.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_acrypt.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -31,14 +31,10 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#define ACrypt __ACrypt
-
 #include <exec/types.h>
 #include <string.h>
 #include <clib/alib_protos.h>

-#undef ACrypt
-
 /****************************************************************************/

 #include "debug.h"
@@ -49,10 +45,6 @@

 /****************************************************************************/

-UBYTE * ACrypt(UBYTE * buffer, const UBYTE * password, const UBYTE * user);
-
-/****************************************************************************/
-
 UBYTE *
 ACrypt(UBYTE * buffer, const UBYTE * password, const UBYTE * user)
 {
--- a/library/amiga_addtof.c
+++ b/library/amiga_addtof.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_addtof.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_addtof.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ typedef LONG (* CFUNC)(APTR arg);

 /****************************************************************************/

-STATIC LONG INTERRUPT ASM
+static LONG INTERRUPT ASM
 call_routine(REG(a1,struct Isrvstr *i))
 {
 	CFUNC p = (CFUNC)i->ccode;
--- a/library/amiga_argarraydone.c
+++ b/library/amiga_argarraydone.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarraydone.c,v 1.4 2006-09-25 14:05:31 obarthel Exp $
+ * $Id: amiga_argarraydone.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@

 /****************************************************************************/

-extern const unsigned char **CXLIB_argarray;
+extern char **CXLIB_argarray;

 extern struct DiskObject * CXLIB_disko;

--- a/library/amiga_argarrayinit.c
+++ b/library/amiga_argarrayinit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarrayinit.c,v 1.6 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: amiga_argarrayinit.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -61,11 +61,11 @@ struct DiskObject * CXLIB_disko;
 STRPTR *
 ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 {
-	STRPTR * result = NULL;
+	unsigned char ** result = NULL;

 	if(argc != 0) /* run from CLI */
 	{
-		LONG i;
+		int i;

 		if(argc == 1)
 			goto out; /* skip command name */
@@ -75,9 +75,9 @@ ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 			goto out;

 		for(i = 1 ; i < argc ; i++)
-			CXLIB_argarray[i-1] = (unsigned char *)argv[i];
+			CXLIB_argarray[i-1] = argv[i];

-		result = (STRPTR *)CXLIB_argarray;
+		result = (unsigned char **)CXLIB_argarray;
 	}
 	else if (IconBase != NULL)
 	{
@@ -90,7 +90,7 @@ ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 		if(CXLIB_disko == NULL)
 			goto out;

-		result = (STRPTR *)CXLIB_disko->do_ToolTypes;
+		result = (unsigned char **)CXLIB_disko->do_ToolTypes;
 	}

 out:
--- a/library/amiga_argint.c
+++ b/library/amiga_argint.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argint.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_argint.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_argstring.c
+++ b/library/amiga_argstring.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argstring.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_argstring.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_beginio.c
+++ b/library/amiga_beginio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_beginio.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_beginio.c,v 1.3 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -103,10 +103,6 @@ BeginIO(struct IORequest *ior)

 /****************************************************************************/

-VOID BeginIO(struct IORequest *ior);
-
-/****************************************************************************/
-
 VOID
 BeginIO(struct IORequest *ior)
 {
--- a/library/amiga_callhook.c
+++ b/library/amiga_callhook.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhook.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_callhook.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_callhooka.asm
+++ b/library/amiga_callhooka.asm
@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_callhooka.asm,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+*	$Id: amiga_callhooka.asm,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without
--- a/library/amiga_callhooka.c
+++ b/library/amiga_callhooka.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhooka.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_callhooka.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_coercemethod.c
+++ b/library/amiga_coercemethod.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_coercemethod.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_coercemethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_createextio.c
+++ b/library/amiga_createextio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createextio.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_createextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,10 +50,6 @@

 /****************************************************************************/

-struct IORequest * CreateExtIO(CONST struct MsgPort * port, LONG io_size);
-
-/****************************************************************************/
-
 struct IORequest *
 CreateExtIO(CONST struct MsgPort * port, LONG io_size)
 {
--- a/library/amiga_createport.c
+++ b/library/amiga_createport.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createport.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_createport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,10 +50,6 @@

 /****************************************************************************/

-struct MsgPort * CreatePort(CONST_STRPTR name, LONG pri);
-
-/****************************************************************************/
-
 struct MsgPort *
 CreatePort(CONST_STRPTR name, LONG pri)
 {
--- a/library/amiga_createstdio.c
+++ b/library/amiga_createstdio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createstdio.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_createstdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,10 +50,6 @@

 /****************************************************************************/

-struct IOStdReq * CreateStdIO(CONST struct MsgPort * port);
-
-/****************************************************************************/
-
 struct IOStdReq *
 CreateStdIO(CONST struct MsgPort * port)
 {
--- a/library/amiga_createtask.c
+++ b/library/amiga_createtask.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createtask.c,v 1.6 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_createtask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -46,12 +46,6 @@

 /****************************************************************************/

-#ifndef _STDLIB_PROFILE_H
-#include "stdlib_profile.h"
-#endif /* _STDLIB_PROFILE_H */
-
-/****************************************************************************/
-
 #include "macros.h"
 #include "debug.h"

@@ -209,10 +203,6 @@ CreateTask(CONST_STRPTR name,LONG pri,CONST APTR init_pc,ULONG stack_size)

 /****************************************************************************/

-struct Task * CreateTask(CONST_STRPTR name,LONG pri,CONST APTR init_pc,ULONG stack_size);
-
-/****************************************************************************/
-
 struct Task *
 CreateTask(CONST_STRPTR name,LONG pri,CONST APTR init_pc,ULONG stack_size)
 {
--- a/library/amiga_deleteextio.c
+++ b/library/amiga_deleteextio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteextio.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_deleteextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,10 +50,6 @@

 /****************************************************************************/

-VOID DeleteExtIO(struct IORequest * io);
-
-/****************************************************************************/
-
 VOID
 DeleteExtIO(struct IORequest * io)
 {
--- a/library/amiga_deleteport.c
+++ b/library/amiga_deleteport.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteport.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_deleteport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,10 +50,6 @@

 /****************************************************************************/

-VOID DeletePort(struct MsgPort * port);
-
-/****************************************************************************/
-
 VOID
 DeletePort(struct MsgPort * port)
 {
--- a/library/amiga_deletestdio.c
+++ b/library/amiga_deletestdio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletestdio.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_deletestdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,10 +50,6 @@

 /****************************************************************************/

-VOID DeleteStdIO(struct IOStdReq * io);
-
-/****************************************************************************/
-
 VOID
 DeleteStdIO(struct IOStdReq * io)
 {
--- a/library/amiga_deletetask.c
+++ b/library/amiga_deletetask.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletetask.c,v 1.5 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_deletetask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -63,10 +63,6 @@ DeleteTask(struct Task *tc)

 /****************************************************************************/

-VOID DeleteTask(struct Task *tc);
-
-/****************************************************************************/
-
 VOID
 DeleteTask(struct Task *tc)
 {
--- a/library/amiga_domethod.c
+++ b/library/amiga_domethod.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_domethod.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_domethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_dosupermethod.c
+++ b/library/amiga_dosupermethod.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dosupermethod.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_dosupermethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_dotimer.c
+++ b/library/amiga_dotimer.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dotimer.c,v 1.8 2006-04-05 06:43:56 obarthel Exp $
+ * $Id: amiga_dotimer.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,34 +44,11 @@

 /****************************************************************************/

-#ifndef _STDLIB_PROFILE_H
-#include "stdlib_profile.h"
-#endif /* _STDLIB_PROFILE_H */
-
-/****************************************************************************/
-
 #include "macros.h"
 #include "debug.h"

 /****************************************************************************/

-/* A quick workaround for the timeval/timerequest->TimeVal/TimeRequest
-   change in the recent OS4 header files. */
-
-#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
-
-#define timeval		TimeVal
-#define tv_secs		Seconds
-#define tv_micro	Microseconds
-
-#define timerequest	TimeRequest
-#define tr_node		Request
-#define tr_time		Time
-
-#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
-
-/****************************************************************************/
-
 LONG
 DoTimer(struct timeval *tv,LONG unit,LONG command)
 {
@@ -81,38 +58,18 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)

 	assert( tv != NULL );

-	#if defined(__amigaos4__)
+	mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
+	if(mp == NULL)
 	{
-		mp = AllocSysObjectTags(ASOT_PORT,
-			ASOPORT_Action,		PA_SIGNAL,
-			ASOPORT_AllocSig,	FALSE,
-			ASOPORT_Signal,		SIGB_SINGLE,
-			ASOPORT_Target,		FindTask(NULL),
-		TAG_DONE);
-
-		if(mp == NULL)
-		{
-			error = IOERR_OPENFAIL;
-			goto out;
-		}
+		error = IOERR_OPENFAIL;
+		goto out;
 	}
-	#else
-	{
-		mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
-		if(mp == NULL)
-		{
-			error = IOERR_OPENFAIL;
-			goto out;
-		}

-		mp->mp_Node.ln_Type	= NT_MSGPORT;
-		mp->mp_Flags		= PA_SIGNAL;
-		mp->mp_SigBit		= SIGB_SINGLE;
-		mp->mp_SigTask		= FindTask(NULL);
-
-		NewList(&mp->mp_MsgList);
-	}
-	#endif /* __amigaos4__ */
+	mp->mp_Node.ln_Type	= NT_MSGPORT;
+	mp->mp_Flags		= PA_SIGNAL;
+	mp->mp_SigBit		= SIGB_SINGLE;
+	mp->mp_SigTask		= FindTask(NULL);
+	NewList(&mp->mp_MsgList);

 	tr = (struct timerequest *)CreateIORequest(mp,sizeof(*tr));
 	if(tr == NULL)
@@ -131,7 +88,7 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)

 	PROFILE_OFF();

-	SetSignal(0,(1UL << mp->mp_SigBit));
+	SetSignal(0,SIGF_SINGLE);

 	error = DoIO((struct IORequest *)tr);

@@ -150,16 +107,7 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 		DeleteIORequest((struct IORequest *)tr);
 	}

-	#if defined(__amigaos4__)
-	{
-		if(mp != NULL)
-			FreeSysObject(ASOT_PORT,mp);
-	}
-	#else
-	{
-		FreeVec(mp);
-	}
-	#endif /* __amigaos4__ */
+	FreeVec(mp);

 	return(error);
 }
--- a/library/amiga_fastrand.c
+++ b/library/amiga_fastrand.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_fastrand.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_fastrand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_freeievents.c
+++ b/library/amiga_freeievents.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_freeievents.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_freeievents.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_hookentry.asm
+++ b/library/amiga_hookentry.asm
@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_hookentry.asm,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+*	$Id: amiga_hookentry.asm,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without
--- a/library/amiga_hookentry.c
+++ b/library/amiga_hookentry.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hookentry.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_hookentry.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_hotkey.c
+++ b/library/amiga_hotkey.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hotkey.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_hotkey.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_invertstring.c
+++ b/library/amiga_invertstring.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_invertstring.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_invertstring.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@

 /****************************************************************************/

-STATIC int
+static int
 do_escape(int cc)
 {
 	int result;
@@ -91,7 +91,7 @@ do_escape(int cc)

 /****************************************************************************/

-STATIC ULONG
+static ULONG
 do_angle(STRPTR * strp, struct InputEvent *ie)
 {
 	ULONG result;
--- a/library/amiga_newlist.c
+++ b/library/amiga_newlist.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_newlist.c,v 1.4 2006-09-25 15:12:47 obarthel Exp $
+ * $Id: amiga_newlist.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -43,10 +43,6 @@

 /****************************************************************************/

-VOID NewList(struct List *lh);
-
-/****************************************************************************/
-
 VOID
 NewList(struct List *lh)
 {
--- a/library/amiga_rangerand.c
+++ b/library/amiga_rangerand.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_rangerand.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_rangerand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_remtof.c
+++ b/library/amiga_remtof.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_remtof.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_remtof.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_rexxvars.c
+++ b/library/amiga_rexxvars.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_rexxvars.c,v 1.10 2006-09-25 18:19:44 obarthel Exp $
+ * $Id: amiga_rexxvars.c,v 1.3 2005-01-09 10:10:40 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -34,20 +34,12 @@
 /* We don't want to pull in <clib/alib_protos.h> */
 #define CLIB_ALIB_PROTOS_H

-/****************************************************************************/
-
 #ifndef _STDLIB_HEADERS_H
 #include "stdlib_headers.h"
 #endif /* _STDLIB_HEADERS_H */

 /****************************************************************************/

-#ifndef _STDLIB_CONSTRUCTOR_H
-#include "stdlib_constructor.h"
-#endif /* _STDLIB_CONSTRUCTOR_H */
-
-/****************************************************************************/
-
 #include <rexx/rxslib.h>
 #include <rexx/errors.h>

@@ -68,13 +60,7 @@ static struct RexxSysIFace * IRexxSys;

 /****************************************************************************/

-BOOL CheckRexxMsg(struct RexxMsg *message);
-LONG GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer);
-LONG SetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR value,ULONG length);
-
-/****************************************************************************/
-
-CLIB_CONSTRUCTOR(rexxvars_init)
+CLIB_CONSTRUCTOR(__rexxvars_init)
 {
 	ENTER();

@@ -94,14 +80,12 @@ CLIB_CONSTRUCTOR(rexxvars_init)
 	}
 	#endif /* __amigaos4__ */

-	LEAVE();
-
 	CONSTRUCTOR_SUCCEED();
 }

 /****************************************************************************/

-CLIB_DESTRUCTOR(rexxvars_exit)
+CLIB_DESTRUCTOR(__rexxvars_exit)
 {
 	ENTER();

@@ -142,7 +126,7 @@ CheckRexxMsg(struct RexxMsg *message)
 	if(message->rm_TaskBlock == NULL)
 		goto out;

-	if(NOT IsRexxMsg((struct Message *)message))
+	if(NOT IsRexxMsg(message))
 		goto out;

 	result = TRUE;
@@ -160,12 +144,12 @@ CheckRexxMsg(struct RexxMsg *message)
 LONG
 GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
 {
-	static TEXT buffer[256];
+	static UBYTE buffer[256];
 	LONG result;

 	/* The following uses a function which was added to rexxsyslib.library V45.
 	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg((struct Message *)message))
+	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
 	{
 		result = ERR10_010; /* invalid message packet */
 		goto out;
@@ -195,7 +179,7 @@ SetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR value,ULONG lengt

 	/* The following uses a function which was added to rexxsyslib.library V45.
 	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg((struct Message *)message))
+	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
 	{
 		result = ERR10_010; /* invalid message packet */
 		goto out;
--- a/library/amiga_setsuperattrs.c
+++ b/library/amiga_setsuperattrs.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_setsuperattrs.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_setsuperattrs.c,v 1.3 2005-01-09 10:10:41 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@

 /****************************************************************************/

-STATIC ULONG
+static ULONG
 SetSuperAttrsA(Class * cl,Object * obj,struct TagItem * tags)
 {
 	ULONG result = 0;
--- a/library/amiga_timedelay.c
+++ b/library/amiga_timedelay.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_timedelay.c,v 1.4 2006-04-05 06:43:56 obarthel Exp $
+ * $Id: amiga_timedelay.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -39,19 +39,6 @@

 /****************************************************************************/

-/* A quick workaround for the timeval/timerequest->TimeVal/TimeRequest
-   change in the recent OS4 header files. */
-
-#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
-
-#define timeval		TimeVal
-#define tv_secs		Seconds
-#define tv_micro	Microseconds
-
-#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
-
-/****************************************************************************/
-
 LONG
 TimeDelay(LONG unit,ULONG seconds,ULONG micros)
 {
--- a/library/amiga_waitbeam.c
+++ b/library/amiga_waitbeam.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_waitbeam.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_waitbeam.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/build_archive_amiga
+++ b/library/build_archive_amiga
@@ -1,31 +0,0 @@
-; Simple release archive build script for Amiga systems.
-
-; Set the name of the archive and the directory the
-; files go into
-set dir_name clib2-1.`type c.lib_rev.rev`
-
-; Start with a clean slate
-delete all quiet ram:$dir_name
-
-; Create the directory, copy all the libraries, header files
-; and release note files inside.
-makedir ram:$dir_name
-copy lib ram:${dir_name}/lib all clone quiet
-copy include ram:${dir_name}/include all clone quiet
-copy changes ram:$dir_name clone
-
-; Delete the CVS data from the include directory
-delete ram:${dir_name}/include/CVS ram:${dir_name}/include/sys/CVS ram:${dir_name}/include/arpa/CVS ram:${dir_name}/include/netinet/CVS all quiet
-
-; Finally, create an lha archive in RAM:
-pushcd ram:
-lha -r -x -a a ${dir_name}-gcc-68k.lha ${dir_name}
-popcd
-
-; Move the archive back to this directory
-copy ram:${dir_name}-gcc-68k.lha "" clone
-
-; Clean up...
-delete ram:$dir_name all quiet
-unset dir_name
-
--- a/library/build_archive_unix.sh
+++ b/library/build_archive_unix.sh
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Simple release archive build script for Unix systems.
-# I typically build the library with a cross compiler.
-
-# Set the name of the archive and the directory the
-# files go into
-export dir_name=clib2-1.`cat c.lib_rev.rev`
-
-# Start with a clean slate
-rm -rf $dir_name
-
-# Create the directory, copy all the libraries, header files
-# and release note files inside.
-mkdir $dir_name
-cp -a lib $dir_name
-cp -a lib.threadsafe $dir_name
-cp -a include $dir_name
-cp changes $dir_name
-
-# Delete the CVS data from the include directory
-rm -rf ${dir_name}/include/CVS ${dir_name}/include/sys/CVS ${dir_name}/include/arpa/CVS ${dir_name}/include/netinet/CVS
-
-# Finally, create an lha type 5 archive; the Amiga LhA port
-# can unpack it.
-lha ao5q ${dir_name}-gcc-os4.lha ${dir_name}
-
--- a/library/c.lib_rev.c
+++ b/library/c.lib_rev.c
@@ -1,10 +1,10 @@
 /*
- * $Id: c.lib_rev.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: c.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/c.lib_rev.h
+++ b/library/c.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	202
-#define DATE		"16.1.2007"
-#define VERS		"c.lib 1.202"
-#define VSTRING		"c.lib 1.202 (16.1.2007)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.202 (16.1.2007)"
+#define REVISION	186
+#define DATE		"14.1.2005"
+#define VERS		"c.lib 1.186"
+#define VSTRING		"c.lib 1.186 (14.1.2005)\r\n"
+#define VERSTAG		"\0$VER: c.lib 1.186 (14.1.2005)"
--- a/library/c.lib_rev.rev
+++ b/library/c.lib_rev.rev
@@ -1 +1 @@
-202
+186
--- a/library/changes
+++ b/library/changes
--- a/library/complex_carg.c
+++ b/library/complex_carg.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_carg.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-double
-carg(double complex z)
-{
-	return(atan2(IMAG(z),REAL(z)));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cargf.c
+++ b/library/complex_cargf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cargf.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float
-cargf(float complex z)
-{
-	return(atan2(IMAG(z),REAL(z))); /* ZZZ this really needs to call ata2f(). */
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cargl.c
+++ b/library/complex_cargl.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cargl.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-long double
-cargl(long double complex z)
-{
-	return(atan2(IMAG(z),REAL(z))); /* ZZZ this really needs to call atan2l(). */
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cimag.c
+++ b/library/complex_cimag.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cimag.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-double
-cimag(double complex z)
-{
-	return(IMAG(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cimagf.c
+++ b/library/complex_cimagf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cimagf.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float
-cimagf(float complex z)
-{
-	return(IMAG(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_conj.c
+++ b/library/complex_conj.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_conj.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-double complex
-conj(double complex z)
-{
-	return(CONJ(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_conjf.c
+++ b/library/complex_conjf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_conjf.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float complex
-conjf(float complex z)
-{
-	return(CONJ(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_conjl.c
+++ b/library/complex_conjl.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_conjl.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-long double complex
-conjl(long double complex z)
-{
-	return(CONJ(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_creal.c
+++ b/library/complex_creal.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_creal.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-double
-creal(double complex z)
-{
-	return(REAL(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_crealf.c
+++ b/library/complex_crealf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_crealf.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float
-crealf(float complex z)
-{
-	return(REAL(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_creall.c
+++ b/library/complex_creall.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_creall.c,v 1.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-long double
-creall(long double complex z)
-{
-	return(REAL(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_headers.h
+++ b/library/complex_headers.h
@@ -1,68 +0,0 @@
-/*
- * $Id: complex_headers.h,v 1.4 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#define _COMPLEX_HEADERS_H
-
-/****************************************************************************/
-
-#ifndef _MATH_FP_SUPPORT_H
-#include "math_fp_support.h"
-#endif /* _MATH_FP_SUPPORT_H */
-
-/****************************************************************************/
-
-#if defined(FLOATING_POINT_SUPPORT) && defined(__GNUC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-
-/****************************************************************************/
-
-#include <complex.h>
-#include <math.h>
-
-/****************************************************************************/
-
-#define COMPLEX_SUPPORT
-
-/****************************************************************************/
-
-#define	REAL(z)	(__real__ (z))
-#define	IMAG(z)	(__imag__ (z))
-#define	CONJ(z)	(~(z))
-
-/****************************************************************************/
-
-#endif /* FLOATING_POINT_SUPPORT && __GNUC__ && __STDC_VERSION__ */
-
-/****************************************************************************/
-
-#endif /* _COMPLEX_HEADERS_H */
--- a/library/contrib/README
+++ b/library/contrib/README
@@ -1,3 +0,0 @@
-This directory contains contributions which have not yet been integrated
-with the clib2 library build but which should be in the CVS repository
-both for safekeeping and for you to look at and adapt.
--- a/library/contrib/byteswap/byteswap.h
+++ b/library/contrib/byteswap/byteswap.h
@@ -1,183 +0,0 @@
-
-#ifndef	__BYTESWAP_H
-#define	__BYTESWAP_H
-
-#include <sys/types.h>
-#include <stdint.h>
-
-#if defined(__GNUC__)
-#define	__CONST_FUNC	__attribute__((const))
-#else
-#define	__CONST_FUNC	/* Nothing */
-#endif
-
-/* Single value byteswap functions. */
-
-extern __CONST_FUNC uint16_t bswap16(uint16_t);
-extern __CONST_FUNC uint32_t bswap24(uint32_t);
-extern __CONST_FUNC uint32_t bswap32(uint32_t);
-
-#ifdef	INT64_MIN
-extern __CONST_FUNC uint64_t bswap64(uint64_t);
-#endif
-
-/* Block byteswap functions. The swab() function usually resides in unistd.h, so perhaps it should be moved there? */
-/* NOTE: Contrary to the standard swab(), this version returns the "to" pointer and the pointers are not restrict
- * qualified - so swapping buffer-contents in-place is supported.
- * Also, swab24(), swab32() and swab64() are non-standard functions.
- */
-
-extern void *swab(void *from,void *to,ssize_t nbytes);
-extern void *swab24(void *from,void *to,ssize_t nbytes);	/* Same as swab(), but operates on 24-bit words instead. */
-extern void *swab32(void *from,void *to,ssize_t nbytes);	/* Same as swab(), but operates on 32-bit words instead. */
-extern void *swab64(void *from,void *to,ssize_t nbytes);	/* Same as swab(), but operates on 64-bit words instead. */
-
-#define	swab16(x)	swab(x)
-
-/*
- * Optimized inline-versions for the single-value functions follow.
- * Only GCC+PPC and GCC+m68k support for now.
- */
-
-#if defined(__GNUC__)
-
-/* Select implementation. */
-
-#define	bswap16(x)	(__builtin_constant_p(x))?__const_swap16(x):__swap16(x)
-#define	bswap24(x)	(__builtin_constant_p(x))?__const_swap24(x):__swap24(x)
-#define	bswap32(x)	(__builtin_constant_p(x))?__const_swap32(x):__swap32(x)
-#define	bswap64(x)	(__builtin_constant_p(x))?__const_swap64(x):__swap64(x)
-
-/* Assembler implementations */
-
-#if defined(__PPC__)
-
-static __inline__  __CONST_FUNC uint16_t __swap16(uint16_t u16) {
-	uint_fast16_t result;
-	__asm__("\
-		rlwinm	%[result],%[u16],8,16,24\n\
-		rlwimi	%[result],%[u16],24,24,31\n\
-	":[result]"=&r"(result):[u16]"r"(u16));
-	return(result);
-}
-
-static __inline__ __CONST_FUNC uint32_t __swap24(uint32_t u32) {
-	uint_fast32_t result;
-	__asm__("\
-	rlwinm	%[result],%[u32],16,8,31\n\
-	rlwimi	%[result],%[u32],0,16,24\n\
-	":[result]"=&r"(result):[u32]"r"(u32));
-	return(result);
-}
-
-static __inline__ __CONST_FUNC uint32_t __swap32(uint32_t u32) {
-	uint_fast32_t result;
-	__asm__("\
-	rlwinm	%[result],%[u32],8,8,31\n\
-	rlwimi	%[result],%[u32],24,0,7\n\
-	rlwimi	%[result],%[u32],24,16,23\n\
-	":[result]"=&r"(result):[u32]"r"(u32));
-	return(result);
-}
-
-/*
- * Note: __swap64() might perhaps be optimized a bit more by scheduling the
- * instructions to alternate register-use, but this instead means there
- * are two less registers free since "u64" and "result" may no longer overlap.
- * Decisions, decisions....
- */
-
-static __inline__ __CONST_FUNC uint64_t __swap64(uint64_t u64) {
-	uint_fast64_t result;
-	uint_fast32_t tmp;
-	__asm__("\
-	rlwinm	%[tmp],%[u64],8,8,31\n\
-	rlwimi	%[tmp],%[u64],24,0,7\n\
-	rlwimi	%[tmp],%[u64],24,16,23\n\
-	rlwinm	%[result],%L[u64],8,8,31\n\
-	rlwimi	%[result],%L[u64],24,0,7\n\
-	rlwimi	%[result],%L[u64],24,16,23\n\
-	or			%L[result],%[tmp],%[tmp]\n\
-	":[result]"=r"(result),[tmp]"=&r"(tmp):[u64]"r"(u64));
-	return(result);
-}
-
-#elif defined(__mc68020__)
-
-static __inline__  __CONST_FUNC uint16_t __swap16(uint16_t u16) {
-	__asm__("\
-		rol.w	#8,%[u16]\n\
-	":[u16]"+d"(u16)::"cc");
-	return(u16);
-}
-
-static __inline__ __CONST_FUNC uint32_t __swap24(uint32_t u32) {
-	__asm__("\
-		rol.w	#8,%[u32]\n\
-		swap	%[u32]\n\
-		rol.w	#8,%[u32]\n\
-		ror.l	#8,%[u32]\n\
-	":[u32]"+d"(u32)::"cc");
-	return(u32);
-}
-
-static __inline__ __CONST_FUNC uint32_t __swap32(uint32_t u32) {
-	__asm__("\
-		rol.w	#8,%[u32]\n\
-		swap	%[u32]\n\
-		rol.w	#8,%[u32]\n\
-	":[u32]"+d"(u32)::"cc");
-	return(u32);
-}
-
-static __inline__ __CONST_FUNC uint64_t __swap64(uint64_t u64) {
-	__asm__("\
-		rol.w	#8,%[u64]\n\
-		rol.w	#8,%L[u64]\n\
-		swap	%[u64]\n\
-		swap	%L[u64]\n\
-		rol.w	#8,%[u64]\n\
-		rol.w	#8,%L[u64]\n\
-		exg	%[u64],L%[u64]\n\
-	":[u64]"+d"(u64)::"cc");
-	return(u64);
-}
-
-#else
-/* Unknown or undefined architecture. Perhaps compiling with "-strict -ansi", but should not use this header then anyway. */
-#undef	bswap16
-#undef	bswap24
-#undef	bswap32
-#undef	bswap64
-#define	bswap16(x)	(__builtin_constant_p(x))?__const_swap16(x):bswap16(x)
-#define	bswap24(x)	(__builtin_constant_p(x))?__const_swap24(x):bswap24(x)
-#define	bswap32(x)	(__builtin_constant_p(x))?__const_swap32(x):bswap32(x)
-#define	bswap64(x)	(__builtin_constant_p(x))?__const_swap64(x):bswap64(x)
-#endif
-
-/* C implementations for constant values */
-
-static __inline__ uint16_t __const_swap16(uint16_t u16) {
-	return(u16>>8|u16<<8);
-}
-
-static __inline__ uint32_t __const_swap24(uint32_t u32) {
-	return(((u32&0xff)<<16)|((u32&0xff00))|((u32&0xff0000)>>16));
-}
-
-static __inline__ uint32_t __const_swap32(uint32_t u32) {
-	return(((u32&0xff)<<24)|((u32&0xff00)<<8)|((u32&0xff0000)>>8)|((u32&0xff000000)>>24));
-}
-
-static __inline__ uint64_t __const_swap64(uint64_t u64) {
-	return(((u64&0xffLL)<<56)|((u64&0xff00LL)<<40)|((u64&0xff0000LL)<<24)|((u64&0xff000000LL)<<8)|
-		((u64&0xff00000000LL)>>8)|((u64&0xff0000000000LL)>>24)|((u64&0xff000000000000LL)>>40)|((u64&0xff00000000000000LL)>>56));
-}
-
-#endif	/* __GNUC__ */
-
-
-#endif	/* __BYTESWAP_H */
-
-/* vi:set ts=3: */
-
--- a/library/contrib/byteswap/byteswap_bswap16.c
+++ b/library/contrib/byteswap/byteswap_bswap16.c
@@ -1,28 +0,0 @@
-
-#if defined(__PPC__) && defined(__GNUC__)
-
-asm("\
-	.text\n\
-	.align 2\n\
-	.globl bswap16\n\
-	.type	bswap16, @function\n\
-bswap16:\n\
-#	rlwinm	%r4,%r3,8,16,24\n\
-#	rlwimi	%r4,%r3,24,24,31\n\
-#	or			%r3,%r4,%r4\n\
-	rlwimi	%r3,%r3,16,8,15\n\
-	srwi		%r3,%r3,8\n\
-	blr\n\
-");
-
-#else
-
-#include <stdint.h>
-
-uint16_t bswap16(uint16_t u16)
-{
-return(u16>>8|u16<<8);
-}
-
-#endif
-
--- a/library/contrib/byteswap/byteswap_bswap24.c
+++ b/library/contrib/byteswap/byteswap_bswap24.c
@@ -1,29 +0,0 @@
-
-#if defined(__PPC__) && defined(__GNUC__)
-
-asm("	.text\n\
-	.align 2\n\
-	.globl bswap24\n\
-	.type	bswap24, @function\n\
-bswap32:\n\
-	rlwinm	%r4,%r3,16,8,31\n\
-	rlwimi	%r4,%r3,0,16,24\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-");
-
-#else
-
-#include <stdint.h>
-
-uint32_t bswap24(uint32_t u32)
-{
-	return(
-		((u32&0xff)<<16)|
-		((u32&0xff00))|
-		((u32&0xff0000)>>16)
-	);
-}
-
-#endif
-
--- a/library/contrib/byteswap/byteswap_bswap32.c
+++ b/library/contrib/byteswap/byteswap_bswap32.c
@@ -1,31 +0,0 @@
-
-#if defined(__PPC__) && defined(__GNUC__)
-
-asm("	.text\n\
-	.align 2\n\
-	.globl bswap32\n\
-	.type	bswap32, @function\n\
-bswap32:\n\
-	rlwinm	%r4,%r3,8,8,31\n\
-	rlwimi	%r4,%r3,24,0,7\n\
-	rlwimi	%r4,%r3,24,16,23\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-");
-
-#else
-
-#include <stdint.h>
-
-uint32_t bswap32(uint32_t u32)
-{
-	return(
-		((u32&0xff)<<24)|
-		((u32&0xff00)<<8)|
-		((u32&0xff0000)>>8)|
-		((u32&0xff000000)>>24)
-	);
-}
-
-#endif
-
--- a/library/contrib/byteswap/byteswap_bswap64.c
+++ b/library/contrib/byteswap/byteswap_bswap64.c
@@ -1,48 +0,0 @@
-
-#if defined(USE_64_BIT_INTS)
-
-#if defined(__PPC__) && defined(__GNUC__)
-
-asm("	.text\n\
-	.align 2\n\
-	.globl bswap64\n\
-	.type	bswap64, @function\n\
-bswap64:\n\
-	rlwinm	%r5,%r3,8,8,31\n\
-	rlwimi	%r5,%r3,24,0,7\n\
-	rlwimi	%r5,%r3,24,16,23\n\
-	rlwinm	%r3,%r4,8,8,31\n\
-	rlwimi	%r3,%r4,24,0,7\n\
-	rlwimi	%r3,%r4,24,16,23\n\
-	or			%r4,%r5,%r5\n\
-	blr\n\
-");
-
-#else
-
-#include <stdint.h>
-
-uint64_t bswap64(uint64_t u64)
-{
-union {
-	uint64_t ll;
-	uint32_t l[2];
-} v={.ll=u64};
-uint32_t tmp;
-tmp=v.l[0];
-v.l[0]=((v.l[1]&0xff)<<24)|
-		((v.l[1]&0xff00)<<8)|
-		((v.l[1]&0xff0000)>>8)|
-		((v.l[1]&0xff000000)>>24);
-v.l[1]=((tmp&0xff)<<24)|
-		((tmp&0xff00)<<8)|
-		((tmp&0xff0000)>>8)|
-		((tmp&0xff000000)>>24);
-return(v.ll);
-}
-
-#endif
-
-#endif
-
-
--- a/library/contrib/byteswap/byteswap_swab.c
+++ b/library/contrib/byteswap/byteswap_swab.c
@@ -1,70 +0,0 @@
-
-#if defined(__GNUC__) && defined(__PPC__)
-
-/* r3=from, r4=to, r5=len/count, r6=index, r7=load/store/temp */
-
-asm("\
-	.text\n\
-	.align 2\n\
-	.globl swab\n\
-	.type swab,@function\n\
-swab:\n\
-	dcbt		0,%r3\n\
-	srawi.	%r5,%r5,1\n\
-	bc			4,gt,.exit\n\
-	andi.		%r7,%r3,3		# Check if we start on an address evenly divisible by 4.\n\
-	li			%r6,0\n\
-	bc			4,gt,.preploop\n\
-	lhbrx		%r7,%r6,%r3		# Fix alignment if needed.\n\
-	sthx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,2\n\
-	subi		%r5,%r5,1\n\
-.preploop:\n\
-	andi.		%r7,%r5,1		# Check if even or odd number of 16-bit words.\n\
-	srawi		%r5,%r5,1		# Number of 32-bit words to half-swap.\n\
-	mtctr		%r5\n\
-	bc			12,gt,.oddloop	# Jump to loop for odd number of 16-bit words.\n\
-.loop:							# Loop is 'unrolled' by reading/writing 32-bit words.\n\
-	lwbrx		%r7,%r6,%r3\n\
-	rotlwi	%r7,%r7,16\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	bc			0,lt,.loop\n\
-.exit:\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-.oddloop:\n\
-	lwbrx		%r7,%r6,%r3\n\
-	rotlwi	%r7,%r7,16\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	bc			0,lt,.oddloop\n\
-	sub		%r6,%r6,2\n\
-	lhbrx		%r7,%r6,%r3		# Fix last 16-bit word.\n\
-	sthx		%r7,%r6,%r4\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-");
-
-#else
-
-#include <sys/types.h>
-#include <stdint.h>
-
-void *swab(void *from,void *to,ssize_t len)
-{
-int i;
-uint16_t u16,*u16in=from,*u16out=to;
-
-for(i=0;i<(len>>1);i++) {
-	u16=u16in[i];
-	u16out[i]=u16>>8|u16<<8;
-}
-
-return(u16out);
-}
-
-#endif
-
-
-
--- a/library/contrib/byteswap/byteswap_swab24.c
+++ b/library/contrib/byteswap/byteswap_swab24.c
@@ -1,91 +0,0 @@
-
-#if defined(__GNUC__) && defined(__PPC__)
-
-/* r3=from, r4=to, r5=len/remaining, r6/r7=index & r7=temp, r8/r9/r10=read/write temp */
-
-asm("\
-	.text\n\
-	.align 2\n\
-	.globl swab24\n\
-	.type swab24,@function\n\
-swab24:\n\
-	dcbt		0,%r3\n\
-	li			%r7,3\n\
-	divwu		%r5,%r5,%r7\n\
-	andi.		%r7,%r5,3\n\
-	srawi.	%r5,%r5,2\n\
-	mtctr		%r5\n\
-	or			%r5,%r7,%r7\n\
-	li			%r6,0\n\
-	bc			4,gt,.postfix\n\
-.loop:\n\
-	lwbrx		%r8,%r6,%r3\n\
-	addi		%r7,%r6,4\n\
-	lwzx		%r9,%r7,%r3\n\
-	addi		%r7,%r6,8\n\
-	lwbrx		%r10,%r7,%r3\n\
-	rotlwi	%r8,%r8,8\n\
-	or			%r7,%r9,%r9\n\
-	rlwimi	%r9,%r8,16,8,15\n\
-	rlwimi	%r9,%r10,8,16,23\n\
-	rlwimi	%r8,%r7,16,24,31\n\
-	rotrwi	%r10,%r10,8\n\
-	rlwimi	%r10,%r7,16,0,7\n\
-	stwx		%r8,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	stwx		%r9,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	stwx		%r10,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	bc			0,lt,.loop\n\
-.postfix:	# Fix any remaining 24-bit words (number of remaining words in r5).\n\
-	or.		%r5,%r5,%r5\n\
-	bc			4,gt,.exit\n\
-	mtctr		%r5\n\
-	add		%r3,%r3,%r6\n\
-	add		%r6,%r4,%r6\n\
-	subi		%r3,%r3,1\n\
-.fixloop:\n\
-	lbzu		%r7,1(%r3)\n\
-	lbzu		%r8,1(%r3)\n\
-	lbzu		%r9,1(%r3)\n\
-	stb		%r7,2(%r6)\n\
-	stb		%r8,1(%r6)\n\
-	stb		%r9,0(%r6)\n\
-	addi		%r6,%r6,3\n\
-	bc			0,lt,.fixloop\n\
-.exit:\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-");
-
-#else
-
-#include <sys/types.h>
-#include <stdint.h>
-
-/*
- * Ugh, this is really very, very ineffiecient.
- * (But simple, understandable and safe)
- */
-
-void *swab24(void *from,void *to,ssize_t len)
-{
-uint8_t *src=from,B0,B1,B2,*dst=to;
-int i;
-
-for(i=0;i<len;i+=3) {
-	B0=src[i];
-	B1=src[i+1];
-	B2=src[i+2];
-	dst[i]=B2;
-	dst[i+1]=B1;
-	dst[i+2]=B0;
-}
-
-return(to);
-}
-
-#endif
-
-
--- a/library/contrib/byteswap/byteswap_swab32.c
+++ b/library/contrib/byteswap/byteswap_swab32.c
@@ -1,112 +0,0 @@
-
-#if defined(__GNUC__) && defined(__PPC__)
-
-/* r3=from, r4=to, r5=len, r6=index, r7=load/store temp */
-
-asm("\
-	.text\n\
-	.align 2\n\
-	.globl swab32\n\
-	.type swab32,@function\n\
-swab32:\n\
-	srawi.	%r5,%r5,2\n\
-	li			%r6,0\n\
-	bc			4,gt,.exit\n\
-	mtctr		%r5\n\
-.loop:\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	bc			0,lt,.loop\n\
-.exit:\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-");
-
-/* r3=from, r4=to, r5=len/temp, r6=index, r7=load/store temp, r8=cache hint
- *
- * The unrolled, cache-hinting version appears to be about 4.5% faster, but
- * in this case I opted for the smaller implementation. swab64() appears to
- * gain more from cache-hinting - probably because of it using more registers
- * for intermediate storage.
-asm("\
-	.text\n\
-	.align 2\n\
-	.globl swab32\n\
-	.type swab32,@function\n\
-swab32:\n\
-	dcbt		0,%r3\n\
-	andi.		%r8,%r5,31		# The number of bytes handled in '.pre'. Used for prefetch hint.\n\
-	srawi		%r5,%r5,2		# Convert bytes-># of 32-bit words\n\
-	andi.		%r7,%r5,7\n\
-	li			%r6,0\n\
-	bc			4,gt,.preploop\n\
-	mtctr		%r7\n\
-.pre:								# One 32-bit word at a time until we have (nLeft%8)==0 \n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	bc			0,lt,.pre\n\
-.preploop:\n\
-	srawi.	%r5,%r5,3		# Divide by 8 again to get number of loops.\n\
-	addi		%r8,%r8,32		# Start address for next loop (from r3).\n\
-	bc			4,gt,.exit\n\
-	mtctr		%r5\n\
-.loop:							# Loop unrolled 8 times = 32 bytes = 1 cache-line (except on the 970).\n\
-	dcbt		%r8,%r3			# Cache hint (prefetch) for the next loop\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	lwbrx		%r7,%r6,%r3\n\
-	stwx		%r7,%r6,%r4\n\
-	addi		%r6,%r6,4\n\
-	addi		%r8,%r8,32		# Update cache-hint offset\n\
-	bc			0,lt,.loop\n\
-.exit:\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-");
-*/
-
-#else
-
-#include <sys/types.h>
-#include <stdint.h>
-
-void *swab32(void *from,void *to,ssize_t len)
-{
-int i;
-uint32_t *u32in=from,*u32out=to,tmp;
-
-for(i=0;i<(len>>2);i++) {
-	tmp=u32in[i];
-	u32out[i]=((tmp&0xff)<<24)|
-		((tmp&0xff00)<<8)|
-		((tmp&0xff0000)>>8)|
-		((tmp&0xff000000)>>24);
-}
-
-return(to);
-}
-
-#endif
-
-
--- a/library/contrib/byteswap/byteswap_swab64.c
+++ b/library/contrib/byteswap/byteswap_swab64.c
@@ -1,101 +0,0 @@
-
-#if defined(__GNUC__) && defined(__PPC__)
-
-/* r3=from, r4=to, r5=len/temp, r6/r7=index, r8/r9=load/store temp, r10=cache hint */
-
-/* This version is unrolled and uses cache-hinting. It appears to gain about 10%
- * over a non-unrolled, non-hinting version.
- */
-
-asm("\
-	.text\n\
-	.align 2\n\
-	.globl swab64\n\
-	.type swab64,@function\n\
-swab64:\n\
-	dcbt		0,%r3\n\
-	andi.		%r10,%r5,31		# The number of bytes handled in '.pre'. Used for prefetch hint.\n\
-	srawi		%r5,%r5,3		# Convert bytes-># of 64-bit words\n\
-	andi.		%r7,%r5,3\n\
-	li			%r6,0\n\
-	bc			4,gt,.preploop\n\
-	mtctr		%r7\n\
-.pre:								# One 64-bit word at a time until we have (nLeft%4)==0 \n\
-	lwbrx		%r8,%r6,%r3\n\
-	addi		%r7,%r6,4\n\
-	lwbrx		%r9,%r7,%r3\n\
-	stwx		%r8,%r7,%r4\n\
-	stwx		%r9,%r6,%r4\n\
-	addi		%r6,%r6,8\n\
-	bc			0,lt,.pre\n\
-.preploop:\n\
-	srawi.	%r5,%r5,2		# Divide by 4 again to get number of loops.\n\
-	addi		%r10,%r10,32	# Start address for next loop.\n\
-	bc			4,gt,.exit\n\
-	mtctr		%r5\n\
-.loop:							# Loop unrolled 4 times = 32 bytes = 1 cache-line (except on the 970).\n\
-	dcbt		%r10,%r3			# Cache hint (prefetch) for the next iteration\n\
-	lwbrx		%r8,%r6,%r3\n\
-	addi		%r7,%r6,4\n\
-	lwbrx		%r9,%r7,%r3\n\
-	stwx		%r8,%r7,%r4\n\
-	stwx		%r9,%r6,%r4\n\
-	addi		%r6,%r6,8\n\
-	lwbrx		%r8,%r6,%r3\n\
-	addi		%r7,%r6,4\n\
-	lwbrx		%r9,%r7,%r3\n\
-	stwx		%r8,%r7,%r4\n\
-	stwx		%r9,%r6,%r4\n\
-	addi		%r6,%r6,8\n\
-	lwbrx		%r8,%r6,%r3\n\
-	addi		%r7,%r6,4\n\
-	lwbrx		%r9,%r7,%r3\n\
-	stwx		%r8,%r7,%r4\n\
-	stwx		%r9,%r6,%r4\n\
-	addi		%r6,%r6,8\n\
-	lwbrx		%r8,%r6,%r3\n\
-	addi		%r7,%r6,4\n\
-	lwbrx		%r9,%r7,%r3\n\
-	stwx		%r8,%r7,%r4\n\
-	stwx		%r9,%r6,%r4\n\
-	addi		%r6,%r6,8\n\
-	addi		%r10,%r10,32		# Update cache-hint offset\n\
-	bc			0,lt,.loop\n\
-.exit:\n\
-	or			%r3,%r4,%r4\n\
-	blr\n\
-");
-
-#else
-
-#include <sys/types.h>
-#include <stdint.h>
-
-void *swab64(void *from,void *to,ssize_t len)
-{
-int i;
-struct {
-	uint32_t	u32[2];
-} *u64in=from,*u64out=to;
-uint32_t tmp1,tmp2;
-
-for(i=0;i<(len>>3);i++) {
-	tmp1=u64in[i].u32[0];
-	tmp2=u64in[i].u32[1];
-	u64out[i].u32[0]=((tmp2&0xff)<<24)|
-		((tmp2&0xff00)<<8)|
-		((tmp2&0xff0000)>>8)|
-		((tmp2&0xff000000)>>24);
-	u64out[i].u32[1]=((tmp1&0xff)<<24)|
-		((tmp1&0xff00)<<8)|
-		((tmp1&0xff0000)>>8)|
-		((tmp1&0xff000000)>>24);
-}
-
-return(to);
-}
-
-#endif
-
-/* vi:set ts=3: */
-
--- a/library/crt0.S
+++ b/library/crt0.S
@@ -1,12 +1,11 @@
 //
-//	$Id: crt0.S,v 1.6 2005-10-11 09:28:29 obarthel Exp $
+//	$Id: crt0.S,v 1.2 2004-11-28 12:31:27 tfrieden Exp $
 //
 //	:ts=4
 //

 	.text

-	.globl  main	/* This enforces linkage against the main() function */
 	.globl  _main
 	.globl  _start

@@ -26,3 +25,16 @@ _start:
 #endif

 	b	_main
+
+#if defined(BASEREL_DATA)
+	.section .rodata
+
+	.globl __data_segment_descriptor
+__data_segment_descriptor:
+	.long __data_start
+	.long __data_end
+	.long _DATA_BASE_
+
+	.section .dend, "wa", @nobits
+	.space 	4
+#endif
--- a/library/crtbegin.c
+++ b/library/crtbegin.c
@@ -1,18 +1,21 @@
 /* 
- * $Id: crtbegin.c,v 1.11 2006-09-22 09:02:51 obarthel Exp $
+ * $Id: crtbegin.c,v 1.3 2004-09-29 16:54:54 obarthel Exp $
 *
 * :ts=4
 *
- * Handles global constructors and destructors for the OS4 GCC build.
+ * Handles global constructors and destructors.
 */

-#if defined(__amigaos4__)
+#include <exec/types.h>

 /****************************************************************************/

-#ifndef EXEC_TYPES_H
-#include <exec/types.h>
-#endif /* EXEC_TYPES_H */
+#include <stdlib.h>
+#include <setjmp.h>
+
+/****************************************************************************/
+
+#if defined(__amigaos4__)

 /****************************************************************************/

@@ -22,27 +25,108 @@
 * with a NULL pointer entry and is put at the end of the sections. This way, the init
 * code can find the global constructor/destructor pointers
 */
-static void (*__CTOR_LIST__[1]) (void) __attribute__(( used, section(".ctors"), aligned(sizeof(void (*)(void))) ));
-static void (*__DTOR_LIST__[1]) (void) __attribute__(( used, section(".dtors"), aligned(sizeof(void (*)(void))) ));
+static void (*__CTOR_LIST__[1]) (void) __attribute__((section(".ctors"))) = { (void *)-1 };
+static void (*__DTOR_LIST__[1]) (void) __attribute__((section(".dtors"))) = { (void *)-1 };

 /****************************************************************************/

-void _init(void);
-void _fini(void);
+static void
+_do_ctors(void)
+{
+	void (**pFuncPtr)(void);
+
+	/* Skip the first entry in the list (it's -1 anyway) */
+	pFuncPtr = __CTOR_LIST__ + 1;
+
+	/* Call all constructors in forward order */
+	while (*pFuncPtr != NULL)
+		(**pFuncPtr++)();
+}
+
+/****************************************************************************/
+
+static void
+_do_dtors(void)
+{
+	ULONG i = (ULONG)__DTOR_LIST__[0];
+	void (**pFuncPtr)(void);
+
+	if (i == ~0UL)
+	{
+		/* Find the end of the destructors list */
+		i = 1;
+
+		while (__DTOR_LIST__[i] != NULL)
+			i++;
+
+		/* We're at the NULL entry now. Go back by one */
+		i--;
+	}
+
+	/* Call all destructors in reverse order */
+	pFuncPtr = __DTOR_LIST__ + i;
+	while (i-- > 0)
+		(**pFuncPtr--)();
+}
+
+/****************************************************************************/
+
+#else
+
+/****************************************************************************/
+
+typedef void (*func_ptr)(void);
+
+/****************************************************************************/
+
+static void
+_do_ctors(void)
+{
+	extern func_ptr __CTOR_LIST__[];
+	ULONG nptrs = (ULONG)__CTOR_LIST__[0];
+	ULONG i;
+
+	for(i = nptrs ; i > 0 ; i--)
+		__CTOR_LIST__[i]();
+}
+
+/****************************************************************************/
+
+static void
+_do_dtors(void)
+{
+	extern func_ptr __DTOR_LIST__[];
+	extern jmp_buf __exit_jmp_buf;
+	ULONG nptrs = (ULONG)__DTOR_LIST__[0];
+	static ULONG i;
+
+	/* If one of the destructors drops into
+	 * exit(), processing will continue with
+	 * the next following destructor.
+	 */
+	(void)setjmp(__exit_jmp_buf);
+
+	while(i++ < nptrs)
+		__DTOR_LIST__[i]();
+}
+
+/****************************************************************************/
+
+#endif /*__amigaos4__ */
+
+/****************************************************************************/
+
+/* FIXME: Do we need to put these in .init/.fini sections? */
+
+//void _init(void) __attribute__((section(".init")));
+//void _fini(void) __attribute__((section(".fini")));

 /****************************************************************************/

 void
 _init(void)
 {
-	int num_ctors,i;
-	int j;
-
-	for(i = 1, num_ctors = 0 ; __CTOR_LIST__[i] != NULL ; i++)
-		num_ctors++;
-
-	for(j = 0 ; j < num_ctors ; j++)
-		__CTOR_LIST__[num_ctors - j]();
+	_do_ctors();
 }

 /****************************************************************************/
@@ -50,16 +134,5 @@ _init(void)
 void
 _fini(void)
 {
-	int num_dtors,i;
-	static int j;
-
-	for(i = 1, num_dtors = 0 ; __DTOR_LIST__[i] != NULL ; i++)
-		num_dtors++;
-
-	while(j++ < num_dtors)
-		__DTOR_LIST__[j]();
+	_do_dtors();
 }
-
-/****************************************************************************/
-
-#endif /*__amigaos4__ */
--- a/library/crtend.c
+++ b/library/crtend.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: crtend.c,v 1.2 2005-03-09 21:07:25 obarthel Exp $
+ * $Id: crtend.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
@@ -10,10 +10,9 @@

 /****************************************************************************/

-static void (*__CTOR_LIST__[1]) (void) __attribute__((used, section(".ctors"), aligned(sizeof(void (*)(void))) ));
-static void (*__DTOR_LIST__[1]) (void) __attribute__((used, section(".dtors"), aligned(sizeof(void (*)(void))) ));
+static volatile void (*__CTOR_LIST__[1]) (void) __attribute__((used,section(".ctors"))) = { (void *)0 };
+static volatile void (*__DTOR_LIST__[1]) (void) __attribute__((used,section(".dtors"))) = { (void *)0 };

 /****************************************************************************/

 #endif /*__amigaos4__ */
-
--- a/library/ctype_headers.h
+++ b/library/ctype_headers.h
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_headers.h,v 1.6 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -42,25 +42,18 @@

 /****************************************************************************/

-#ifndef _STDLIB_LOCALEBASE_H
-#include "stdlib_localebase.h"
-#endif /* _STDLIB_LOCALEBASE_H */
-
-#ifndef _STDLIB_UTILITYBASE_H
-#include "stdlib_utilitybase.h"
-#endif /* _STDLIB_UTILITYBASE_H */
+#ifndef _STDLIB_LOCALE_UTILITY_H
+#include "stdlib_locale_utility.h"
+#endif /* _STDLIB_LOCALE_UTILITY_H */

 /****************************************************************************/

-#ifndef _MACROS_H
 #include "macros.h"
-#endif /* _MACROS_H */

 /****************************************************************************/

 #include <locale.h>
 #include <assert.h>
-#include <limits.h>
 #include <ctype.h>

 /****************************************************************************/
--- a/library/ctype_isalnum.c
+++ b/library/ctype_isalnum.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalnum.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isalnum.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -49,26 +49,16 @@ isalnum(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsAlNum(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsAlNum(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = isalpha(c) || isdigit(c);
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isalpha.c
+++ b/library/ctype_isalpha.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalpha.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isalpha.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,19 +47,11 @@ isalpha(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsAlpha(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsAlpha(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -67,7 +59,5 @@ isalpha(int c)
 		          ('A' <= c && c <= 'Z'));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isascii.c
+++ b/library/ctype_isascii.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isascii.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isascii.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isblank.c
+++ b/library/ctype_isblank.c
@@ -1,52 +0,0 @@
-/*
- * $Id: ctype_isblank.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _CTYPE_HEADERS_H
-#include "ctype_headers.h"
-#endif /* _CTYPE_HEADERS_H */
-
-/****************************************************************************/
-
-#undef isblank
-
-/****************************************************************************/
-
-int
-isblank(int c)
-{
-	int result;
-
-	result = (c == '\t' || c == ' ');
-
-	return(result);
-}
--- a/library/ctype_iscntrl.c
+++ b/library/ctype_iscntrl.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_iscntrl.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_iscntrl.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,26 +47,16 @@ iscntrl(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsCntrl(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsCntrl(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = (('\0' <= c && c < ' ') || (c == 127));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isdigit.c
+++ b/library/ctype_isdigit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isdigit.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isdigit.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,26 +47,16 @@ isdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsDigit(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsDigit(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('0' <= c && c <= '9');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isgraph.c
+++ b/library/ctype_isgraph.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isgraph.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isgraph.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,26 +47,16 @@ isgraph(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsGraph(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsGraph(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = (' ' < c && c < 127);
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_islower.c
+++ b/library/ctype_islower.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_islower.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_islower.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,26 +47,16 @@ islower(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsLower(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsLower(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('a' <= c && c <= 'z');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isprint.c
+++ b/library/ctype_isprint.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isprint.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isprint.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,26 +47,16 @@ isprint(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsPrint(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsPrint(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = (' ' <= c && c <= '~');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_ispunct.c
+++ b/library/ctype_ispunct.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_ispunct.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_ispunct.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,19 +47,11 @@ ispunct(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsPunct(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsPunct(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -69,7 +61,5 @@ ispunct(int c)
 		          ('{' <= c && c <= '~'));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isspace.c
+++ b/library/ctype_isspace.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isspace.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isspace.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,19 +47,11 @@ isspace(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsSpace(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsSpace(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -71,7 +63,5 @@ isspace(int c)
 		          c == ' ');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isupper.c
+++ b/library/ctype_isupper.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isupper.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isupper.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,26 +47,16 @@ isupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsUpper(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsUpper(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('A' <= c && c <= 'Z');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isxdigit.c
+++ b/library/ctype_isxdigit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isxdigit.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_isxdigit.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,19 +47,11 @@ isxdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsXDigit(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsXDigit(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -68,7 +60,5 @@ isxdigit(int c)
 		          ('A' <= c && c <= 'F'));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_table.c
+++ b/library/ctype_table.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_table.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_table.c,v 1.3 2005-01-09 15:20:31 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_tolower.c
+++ b/library/ctype_tolower.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_tolower.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_tolower.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -43,26 +43,16 @@ tolower(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = ConvToLower(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = c;
+		result = ConvToLower(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('A' <= c && c <= 'Z') ? (c + ('a' - 'A')) : c;
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_toupper.c
+++ b/library/ctype_toupper.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_toupper.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: ctype_toupper.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -43,26 +43,16 @@ toupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = ConvToUpper(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = c;
+		result = ConvToUpper(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('a' <= c && c <= 'z') ? (c - ('a' - 'A')) : c;
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/debug.c
+++ b/library/debug.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.c,v 1.6 2006-09-25 14:51:15 obarthel Exp $
+ * $Id: debug.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=8
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -133,7 +133,7 @@ _POPDEBUGLEVEL(void)

 /****************************************************************************/

-STATIC VOID
+static void
 _INDENT(void)
 {
 	if(program_name_len > 0)
@@ -160,7 +160,7 @@ _SHOWVALUE(
 {
 	if(__debug_level >= DEBUGLEVEL_Reports)
 	{
-		const char *fmt;
+		char *fmt;

 		switch(size)
 		{
@@ -207,7 +207,7 @@ _SHOWPOINTER(
 {
 	if(__debug_level >= DEBUGLEVEL_Reports)
 	{
-		const char *fmt;
+		char *fmt;

 		_INDENT();

@@ -273,7 +273,7 @@ _DPRINTF(const char *fmt,...)
 		va_list args;

 		va_start(args,fmt);
-		KPutFmt(fmt,args);
+		KPutFmt((char *)fmt,args);
 		va_end(args);

 		KPrintF("\n");
@@ -288,7 +288,7 @@ _DLOG(const char *fmt,...)
 		va_list args;

 		va_start(args,fmt);
-		KPutFmt(fmt,args);
+		KPutFmt((char *)fmt,args);
 		va_end(args);
 	}
 }
--- a/library/debug.h
+++ b/library/debug.h
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.h,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug.h,v 1.3 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=8
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug.lib_rev.c
+++ b/library/debug.lib_rev.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.lib_rev.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug.lib_rev.h
+++ b/library/debug.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	202
-#define DATE		"16.1.2007"
-#define VERS		"debug.lib 1.202"
-#define VSTRING		"debug.lib 1.202 (16.1.2007)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.202 (16.1.2007)"
+#define REVISION	186
+#define DATE		"14.1.2005"
+#define VERS		"debug.lib 1.186"
+#define VSTRING		"debug.lib 1.186 (14.1.2005)\r\n"
+#define VERSTAG		"\0$VER: debug.lib 1.186 (14.1.2005)"
--- a/library/debug.lib_rev.rev
+++ b/library/debug.lib_rev.rev
@@ -1 +1 @@
-202
+186
--- a/library/debug_cmpstrexec.c
+++ b/library/debug_cmpstrexec.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_cmpstrexec.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug_cmpstrexec.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_headers.h
+++ b/library/debug_headers.h
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_headers.h,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -36,15 +36,14 @@

 /****************************************************************************/

-#ifndef EXEC_LIBRARIES_H
 #include <exec/libraries.h>
-#endif /* EXEC_LIBRARIES_H */

 /****************************************************************************/

 #if defined(__SASC)

 #include <clib/exec_protos.h>
+/*#include <pragmas/exec_sysbase_pragmas.h>*/
 #include <pragmas/exec_pragmas.h>

 LONG RawMayGetChar(VOID);
@@ -58,11 +57,7 @@ VOID RawPutChar(UBYTE c);
 /****************************************************************************/

 #if defined(__amigaos4__)
-
-#ifndef EXEC_EMULATION_H
 #include <exec/emulation.h>
-#endif /* EXEC_EMULATION_H */
-
 #endif /* __amigaos4__ */

 /****************************************************************************/
@@ -111,13 +106,11 @@ VOID RawPutChar(UBYTE c);

 /****************************************************************************/

-#ifndef _MACROS_H
-#include "macros.h"
-#endif /* _MACROS_H */
-
-#ifndef _DEBUG_H
 #include "debug.h"
-#endif /* _DEBUG_H */
+
+/****************************************************************************/
+
+#include "macros.h"

 /****************************************************************************/

--- a/library/debug_kcmpstr.c
+++ b/library/debug_kcmpstr.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kcmpstr.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug_kcmpstr.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kdofmt.c
+++ b/library/debug_kdofmt.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kdofmt.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug_kdofmt.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetc.c
+++ b/library/debug_kgetc.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetc.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug_kgetc.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetch1.c
+++ b/library/debug_kgetch1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetch1.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: debug_kgetch1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
+ * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/Show More
+++ b/Show More