mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-29 11:02:01 +00:00
Code Issues Releases Activity

Merge from trunk.

Browse Source
This commit is contained in:
Paul Eggert 2012-04-15 18:12:46 -07:00
commit f7752e6738
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib-src/ChangeLog
View File

@ -1,10 +1,17 @@
2012-04-14 Paul Eggert <eggert@cs.ucla.edu>
2012-04-16 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
* Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
2012-04-16 Paul Eggert <eggert@cs.ucla.edu>
Assume less-ancient POSIX support.
* update-game-score.c: Include <getopt.h> rather than rolling our
own decls for optarg, optind, opterr. See
<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
2012-04-14 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (decode_options) [WINDOWSNT]:
Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com).

5
lib-src/update-game-score.c
View File

@ -46,10 +46,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <fcntl.h>
#endif
#include <sys/stat.h>
/* Needed for SunOS4, for instance. */
extern char *optarg;
extern int optind, opterr;
#include <getopt.h>
static int usage (int err) NO_RETURN;

9
src/ChangeLog
View File

@ -1,5 +1,14 @@
2012-04-16 Paul Eggert <eggert@cs.ucla.edu>
Improve ralloc.c interface checking.
See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
* buffer.c (ralloc_reset_variable, r_alloc, r_re_alloc)
(r_alloc_free) [REL_ALLOC]: Move decls from here ...
* lisp.h (r_alloc, r_alloc_free, r_re_alloc, r_alloc_reset_variable)
[REL_ALLOC]: ... to here, to check interface.
* m/ia64.h (r_alloc, r_alloc_free) [REL_ALLOC && !_MALLOC_INTERNAL]:
Remove decls. This fixes an "It stinks!".
* alloc.c (which_symbols): Fix alignment issue / type clash.
2012-04-15 Andreas Schwab <schwab@linux-m68k.org>

11
src/buffer.c
View File

@ -2006,10 +2006,6 @@ advance_to_char_boundary (EMACS_INT byte_pos)
return byte_pos;
}
#ifdef REL_ALLOC
extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *);
#endif /* REL_ALLOC */
DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text,
1, 1, 0,
doc: /* Swap the text between current buffer and BUFFER. */)
@ -4771,13 +4767,6 @@ mmap_realloc (POINTER_TYPE **var, size_t nbytes)
Buffer-text Allocation
***********************************************************************/
#ifdef REL_ALLOC
extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t);
extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t);
extern void r_alloc_free (POINTER_TYPE **ptr);
#endif /* REL_ALLOC */
/* Allocate NBYTES bytes for buffer B's text buffer. */
static void

8
src/lisp.h
View File

@ -2832,6 +2832,14 @@ extern void syms_of_alloc (void);
extern struct buffer * allocate_buffer (void);
extern int valid_lisp_object_p (Lisp_Object);
#ifdef REL_ALLOC
/* Defined in ralloc.c */
extern void *r_alloc (void **, size_t);
extern void r_alloc_free (void **);
extern void *r_re_alloc (void **, size_t);
extern void r_alloc_reset_variable (void **, void **);
#endif
/* Defined in chartab.c */
EXFUN (Fmake_char_table, 2);
EXFUN (Fset_char_table_parent, 2);

10
src/m/ia64.h
View File

@ -30,13 +30,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define EMACS_INT long
#define pI "l"
#define EMACS_UINT unsigned long
#ifdef REL_ALLOC
#ifndef _MALLOC_INTERNAL
/* "char *" because ralloc.c defines it that way. gmalloc.c thinks it
is allowed to prototype these as "void *" so we don't prototype in
that case. You're right: it stinks! */
extern char *r_alloc (), *r_re_alloc ();
extern void r_alloc_free ();
#endif /* not _MALLOC_INTERNAL */
#endif /* REL_ALLOC */