summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authordas <das>2005-04-26 00:46:01 (GMT)
committerdas <das>2005-04-26 00:46:01 (GMT)
commit24fcde64c436af06b6824359ff50920a2933af27 (patch)
treed2c829948c33b0a374795c6a0e4bc7713a578d48 /compat
parente3d20a2783044861949b7a0230410548b1c59982 (diff)
downloadtcl-24fcde64c436af06b6824359ff50920a2933af27.zip
tcl-24fcde64c436af06b6824359ff50920a2933af27.tar.gz
tcl-24fcde64c436af06b6824359ff50920a2933af27.tar.bz2
* compat/string.h: fixed memchr() protoype for __APPLE__ so that we
build on Mac OS X 10.1 again. * generic/tclNotify.c (TclFinalizeNotifier): fixed notifier not being finalized in unthreaded core (was testing for notifier initialization in current thread by checking thread id != 0 but thread id is always 0 in untreaded core). * unix/tclUnixNotfy.c (Tcl_WaitForEvent): sync with HEAD: only declare and use timeout var in unthreaded core. * unix/Makefile.in: added @PLAT_SRCS@ to SRCS and split out NOTIFY_SRCS from UNIX_SRCS for parity with UNIX_OBJS & NOTIFY_OBJS. * unix/configure.in: only run check for broken strstr implementation if AC_REPLACE_FUNCS(strstr) hasn't already determined that strstr is unavailable, otherwise compat/strstr.o will be used twice (resulting in duplicate symbol link errors on Mac OS X 10.1) * unix/tcl.m4 (Darwin): added configure checks for recently added linker flags -single_module and -search_paths_first to allow building with older tools (and on Mac OS X 10.1), use -single_module in SHLIB_LD and not just T{CL,K}_SHLIB_LD_EXTRAS, added unexporting from Tk of symbols from libtclstub to avoid duplicate symbol warnings, added PLAT_SRCS definition for Mac OS X. (SC_MISSING_POSIX_HEADERS): added caching of dirent.h check. (SC_TCL_64BIT_FLAGS): fixed 'checking for off64_t' message output. * unix/configure: autoconf-2.13
Diffstat (limited to 'compat')
-rw-r--r--compat/string.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/compat/string.h b/compat/string.h
index 37e5140..15f60fb 100644
--- a/compat/string.h
+++ b/compat/string.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: string.h,v 1.4 2000/07/18 18:16:17 ericm Exp $
+ * RCS: @(#) $Id: string.h,v 1.4.18.1 2005/04/26 00:46:02 das Exp $
*/
#ifndef _STRING
@@ -28,7 +28,11 @@
#include <sys/types.h>
#endif
+#ifdef __APPLE__
+extern VOID * memchr _ANSI_ARGS_((CONST VOID *s, int c, size_t n));
+#else
extern char * memchr _ANSI_ARGS_((CONST VOID *s, int c, size_t n));
+#endif
extern int memcmp _ANSI_ARGS_((CONST VOID *s1, CONST VOID *s2,
size_t n));
extern char * memcpy _ANSI_ARGS_((VOID *t, CONST VOID *f, size_t n));