diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 17 | ||||
| -rw-r--r-- | src/m/amdx86-64.h | 9 | ||||
| -rw-r--r-- | src/ralloc.c | 2 | ||||
| -rw-r--r-- | src/window.c | 2 |
4 files changed, 25 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4118fc6f2d8..27a229b0f68 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2006-10-29 Mark Davies <mark@mcs.vuw.ac.nz> (tiny change) + + * ralloc.c (relinquish): Use a long for excess space counter to + handle 64-bit case correctly. + +2006-10-29 Jeramey Crawford <jeramey@jeramey.com> + + * m/amdx86-64.h: Add defines for OpenBSD x86-64. + +2006-10-29 Juanma Barranquero <lekktu@gmail.com> + + * window.c (Fdisplay_buffer): Fix typo in docstring. + 2006-10-27 Ben North <ben@redfrontdoor.org> (tiny change) * w32term.c (x_draw_glyph_string_foreground): Set background mode @@ -431,7 +444,7 @@ avoid confusing redisplay by placing the cursor outside the visible window area. -2006-09-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> +2006-09-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * xterm.c (x_initialize): Don't install Xt event timer here. (x_timeout_atimer_activated_flag): New var. @@ -2176,7 +2189,7 @@ * xdisp.c (display_tool_bar_line): Restore entire tool-bar geometry when backtracking in case last image doesn't fit on line. -2006-05-18 MIYOSHI Masanori <miyoshi@meadowy.org> (tiny change) +2006-05-18 MIYOSHI Masanori <miyoshi@meadowy.org> (tiny change) * xdisp.c (display_tool_bar_line): Don't adjust tool-bar height by more than height of one frame default line. diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 3a1ace91b41..419fa131692 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -118,7 +118,14 @@ Boston, MA 02110-1301, USA. */ #undef LIB_STANDARD #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o -#else /* !__FreeBSD__ */ +#elif defined(__OpenBSD__) + +#undef START_FILES +#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o +#undef LIB_STANDARD +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o + +#else /* !__OpenBSD__ && !__FreeBSD__ */ #undef START_FILES #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o diff --git a/src/ralloc.c b/src/ralloc.c index fea9ea5d0a8..83a26dd35d6 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -330,7 +330,7 @@ static void relinquish () { register heap_ptr h; - int excess = 0; + long excess = 0; /* Add the amount of space beyond break_value in all heaps which have extend beyond break_value at all. */ diff --git a/src/window.c b/src/window.c index 0233c6bf79e..e996fc5c597 100644 --- a/src/window.c +++ b/src/window.c @@ -3590,7 +3590,7 @@ See `same-window-buffer-names' and `same-window-regexps'. */) DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 3, "BDisplay buffer: \nP", doc: /* Make BUFFER appear in some window but don't select it. -BUFFER must be the name of an existing buffer, or, when called from Lisp, +BUFFER must be the name of an existing buffer, or, when called from Lisp, a buffer. If BUFFER is shown already in some window, just use that one, unless the window is the selected window and the optional second |