[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Help-smalltalk] smalltalk-2.1-pre on Sun
From: |
Paolo Bonzini |
Subject: |
Re: [Help-smalltalk] smalltalk-2.1-pre on Sun |
Date: |
Tue, 8 Apr 2003 11:20:00 +0200 |
User-agent: |
Mutt/1.4i |
There are a few more twists for FreeBSD. In some versions, its inttypes.h
is not ANSI compliant.
Paolo
diff -rNc smalltalk-2.1-pre/Makefile.in smalltalk-2.1/Makefile.in
*** smalltalk-2.1-pre/Makefile.in Wed Mar 26 15:04:07 2003
--- smalltalk-2.1/Makefile.in Tue Apr 8 04:19:22 2003
***************
*** 835,845 ****
SMALLTALK_IMAGE="`pwd`" \
./gst -iQ dummy_file
! gst-mode.el: gst-mode.el.in
! sed "s,@\(bindir\)@,$(bindir)," $< > $@
! smalltalk-mode.el: smalltalk-mode.el.in
! sed "s,@\(lispdir\)@,$(lispdir)," $< > $@
# We need to provide a basic packages.xml file when a vpath build is in use
# so that the packages are found in subdirectories of the srcdir
--- 835,845 ----
SMALLTALK_IMAGE="`pwd`" \
./gst -iQ dummy_file
! gst-mode.el: $(srcdir)/gst-mode.el.in
! sed "s,@\(bindir\)@,$(bindir)," $(srcdir)/gst-mode.el.in > $@
! smalltalk-mode.el: $(srcdir)/smalltalk-mode.el.in
! sed "s,@\(lispdir\)@,$(lispdir)," $(srcdir)/smalltalk-mode.el.in > $@
# We need to provide a basic packages.xml file when a vpath build is in use
# so that the packages are found in subdirectories of the srcdir
diff -rNc smalltalk-2.1-pre/libgst/interp.inl smalltalk-2.1/libgst/interp.inl
*** smalltalk-2.1-pre/libgst/interp.inl Tue Jun 25 14:35:36 2002
--- smalltalk-2.1/libgst/interp.inl Tue Apr 8 05:06:09 2003
***************
*** 36,41 ****
--- 36,50 ----
#include <limits.h>
#endif
+ #ifdef HAVE_INTTYPES_H
+ #ifndef UINTMAX_C
+ #define UINTMAX_C(n) n##UL
+ #endif
+ #ifndef UINTMAX_MAX
+ #define UINTMAX_MAX ULONG_MAX
+ #endif
+ #endif
+
/* Multiply a*b and in case of an overflow, answer OVERFLOWING_INT so
that we can work it out the same way we do with adds and
subtracts. */
***************
*** 75,80 ****
--- 84,90 ----
was rewritten so that it has no overflow when multiplying; we
must also have it fail if sizeof(intmax_t) == sizeof(long). */
+
#if defined(HAVE_INTTYPES_H) && UINTMAX_MAX > ULONG_MAX && UINTMAX_MAX >=
(ULONG_MAX * (ULONG_MAX + UINTMAX_C(2)))
intmax_t result = (intmax_t)a * b;
if UNCOMMON (result > MAX_ST_INT || result < MIN_ST_INT)
diff -rNc smalltalk-2.1-pre/libgst/sysdep.c smalltalk-2.1/libgst/sysdep.c
*** smalltalk-2.1-pre/libgst/sysdep.c Thu Mar 27 14:34:50 2003
--- smalltalk-2.1/libgst/sysdep.c Tue Apr 8 04:17:21 2003
***************
*** 1506,1511 ****
--- 1506,1515 ----
static heap_implementation *impl = heap_impl_tab;
+ #if !defined (WIN32) && !defined (MAP_ANON)
+ static int fd = -1;
+ #endif
+
PTR
_gst_osmem_reserve (size_t size)
{
***************
*** 1650,1658 ****
/* Implementation of the four basic primitives when MAP_NORESERVE
is not available. */
- #ifndef MAP_ANON
- static int fd = -1;
- #endif
static char *baseaddr;
static PTR find_heap_base (void);
--- 1654,1659 ----