diff -cNr v22.2b13/ChangeLog.beta v22.2b14/ChangeLog.beta *** v22.2b13/ChangeLog.beta Fri Dec 12 12:07:54 2003 --- v22.2b14/ChangeLog.beta Fri Dec 12 12:08:00 2003 *************** *** 1,3 **** --- 1,18 ---- + Fri Dec 12 12:10:04 2003 (marius@mudos.org (Marius)) + * raised patchlevel to v22.2b14 + * made changes to fix building on Mac OS X 10.3 (Panther) + * fixed logon() in backend.c to check for the object's + destructed status before making the apply [reported by + Arren@Anarres] + * moved the #include of std.h to before the HAS_UALARM + check in ualarm.c [reported by Loriel@Lima] + * fixed pluralization of some words ending in f [reported + by Loriel@Lima] + * fixed pluralization of pants [reported by Malic@Lima] + * fixed std_incl.h to avoid varargs.h if __GNUC__ > 2 + [reported by Loriel@Lima] + * fixed reference counting in f_bind [reported by Beyond] + Sun Sep 15 17:53:16 2002 (marius@mudos.org (Marius)) * raised patchlevel to v22.2b13 * added a newline after the BIGENDIAN define in edit_source. diff -cNr v22.2b13/GNUmakefile v22.2b14/GNUmakefile *** v22.2b13/GNUmakefile Fri Dec 12 12:07:54 2003 --- v22.2b14/GNUmakefile Fri Dec 12 12:08:00 2003 *************** *** 1,4 **** ! MAKE=gmake SHELL=/bin/sh OBJDIR=obj DRIVER_BIN=driver --- 1,4 ---- ! MAKE=make SHELL=/bin/sh OBJDIR=obj DRIVER_BIN=driver *************** *** 8,14 **** INSTALL_DIR=../bin OPTIMIZE= CPP=gcc -E ! CFLAGS=-D__USE_FIXED_PROTOTYPES__ -g -DDEBUG -rdynamic CC=gcc YACC=bison -d -y RANLIB=ranlib --- 8,14 ---- INSTALL_DIR=../bin OPTIMIZE= CPP=gcc -E ! CFLAGS=-D__USE_FIXED_PROTOTYPES__ -g -DDEBUG CC=gcc YACC=bison -d -y RANLIB=ranlib diff -cNr v22.2b13/backend.c v22.2b14/backend.c *** v22.2b13/backend.c Fri Dec 12 12:07:54 2003 --- v22.2b14/backend.c Fri Dec 12 12:08:00 2003 *************** *** 72,77 **** --- 72,81 ---- void logon P1(object_t *, ob) { + if (ob->flags & O_DESTRUCTED) { + return; + } + /* current_object no longer set */ apply(APPLY_LOGON, ob, 0, ORIGIN_DRIVER); /* function not existing is no longer fatal */ diff -cNr v22.2b13/build.MudOS v22.2b14/build.MudOS *** v22.2b13/build.MudOS Fri Dec 12 12:07:54 2003 --- v22.2b14/build.MudOS Fri Dec 12 12:08:00 2003 *************** *** 129,137 **** echo "Trying out some stuff to see what works; ignore errors ..." ! # Mac OS X needs this in order to build properly if test "`uname`" = "Darwin"; then ! NEED_OLD_CPP=-traditional-cpp fi # --- 129,141 ---- echo "Trying out some stuff to see what works; ignore errors ..." ! # Mac OS X needs this in order to build properly with gcc < 3 if test "`uname`" = "Darwin"; then ! GCC_MAJOR="`gcc -v 2>&1 | grep "gcc version" | cut -d ' ' -f 3 | cut -d '.' -f 1`" ! GCC_MINOR="`gcc -v 2>&1 | grep "gcc version" | cut -d ' ' -f 3 | cut -d '.' -f 2`" ! if test "$GCC_MAJOR" -eq "2"; then ! NEED_OLD_CPP=-traditional-cpp ! fi fi # diff -cNr v22.2b13/edit_source.c v22.2b14/edit_source.c *** v22.2b13/edit_source.c Fri Dec 12 12:07:54 2003 --- v22.2b14/edit_source.c Fri Dec 12 12:08:00 2003 *************** *** 1434,1439 **** --- 1434,1440 ---- check_include("INCL_NETINET_IN_H", "netinet/in.h"); check_include("INCL_ARPA_INET_H", "arpa/inet.h"); + check_include("INCL_SYS_TYPES_H", "sys/types.h"); check_include("INCL_SYS_IOCTL_H", "sys/ioctl.h"); check_include("INCL_SYS_SOCKET_H", "sys/socket.h"); check_include("INCL_NETDB_H", "netdb.h"); diff -cNr v22.2b13/efuns_main.c v22.2b14/efuns_main.c *** v22.2b13/efuns_main.c Fri Dec 12 12:07:54 2003 --- v22.2b14/efuns_main.c Fri Dec 12 12:08:00 2003 *************** *** 143,148 **** --- 143,149 ---- new_fp = ALLOCATE(funptr_t, TAG_FUNP, "f_bind"); *new_fp = *old_fp; + new_fp->hdr.ref = 1; new_fp->hdr.owner = ob; /* one ref from being on stack */ if (new_fp->hdr.args) new_fp->hdr.args->ref++; diff -cNr v22.2b13/file.c v22.2b14/file.c *** v22.2b13/file.c Fri Dec 12 12:07:54 2003 --- v22.2b14/file.c Fri Dec 12 12:08:00 2003 *************** *** 31,38 **** #endif #endif - extern int sys_nerr; - int legal_path PROT((char *)); static int match_string PROT((char *, char *)); --- 31,36 ---- diff -cNr v22.2b13/network_incl.h v22.2b14/network_incl.h *** v22.2b13/network_incl.h Fri Dec 12 12:07:54 2003 --- v22.2b14/network_incl.h Fri Dec 12 12:08:00 2003 *************** *** 1,6 **** --- 1,9 ---- #ifndef NETWORK_INCL_H #define NETWORK_INCL_H + #ifdef INCL_SYS_TYPES_H + # include + #endif #ifdef INCL_SYS_IOCTL_H # include #endif diff -cNr v22.2b13/packages/contrib.c v22.2b14/packages/contrib.c *** v22.2b13/packages/contrib.c Fri Dec 12 12:07:53 2003 --- v22.2b14/packages/contrib.c Fri Dec 12 12:07:58 2003 *************** *** 1043,1048 **** --- 1043,1058 ---- suffix = "en"; } break; + case 'P': + case 'p': + if (!strcasecmp(rel + 1, "ants")) + found = PLURAL_SAME; + break; + case 'R': + case 'r': + if (!strcasecmp(rel + 1, "oof")) + found = PLURAL_SUFFIX; + break; case 'S': case 's': if (!strcasecmp(rel + 1, "niff")) { *************** *** 1146,1152 **** case 'F': case 'f': if (end[-2] == 'e' || end[-2] == 'E') break; ! found = PLURAL_CHOP + 2; suffix = "ves"; break; case 'H': case 'h': --- 1156,1165 ---- case 'F': case 'f': if (end[-2] == 'e' || end[-2] == 'E') break; ! if (end[-2] == 'f' || end[-2] == 'F') ! found = PLURAL_CHOP + 2; ! else ! found = PLURAL_CHOP + 1; suffix = "ves"; break; case 'H': case 'h': diff -cNr v22.2b13/patchlevel.h v22.2b14/patchlevel.h *** v22.2b13/patchlevel.h Fri Dec 12 12:07:54 2003 --- v22.2b14/patchlevel.h Fri Dec 12 12:08:00 2003 *************** *** 1 **** ! #define PATCH_LEVEL "v22.2b13" --- 1 ---- ! #define PATCH_LEVEL "v22.2b14" diff -cNr v22.2b13/std_incl.h v22.2b14/std_incl.h *** v22.2b13/std_incl.h Fri Dec 12 12:07:54 2003 --- v22.2b14/std_incl.h Fri Dec 12 12:08:00 2003 *************** *** 118,124 **** # include #endif ! #if defined(__APPLE__) && defined(__GNUC__) /* varargs.h distributed with Mac OSX is broken */ #include #else --- 118,124 ---- # include #endif ! #if (defined(__APPLE__) && defined(__GNUC__)) || __GNUC__ > 2 /* varargs.h distributed with Mac OSX is broken */ #include #else diff -cNr v22.2b13/ualarm.c v22.2b14/ualarm.c *** v22.2b13/ualarm.c Fri Dec 12 12:07:54 2003 --- v22.2b14/ualarm.c Fri Dec 12 12:08:00 2003 *************** *** 1,3 **** --- 1,4 ---- + #include "std.h" #ifndef HAS_UALARM /* * Copyright (c) 1985 Regents of the University of California. *************** *** 35,42 **** #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ualarm.c 5.5 (Berkeley) 2/23/91"; #endif /* LIBC_SCCS and not lint */ - - #include "std.h" #define USPS 1000000 /* # of microseconds in a second */ --- 36,41 ----