mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_3200/mysql-4.0
This commit is contained in:
commit
43db12f631
3 changed files with 14 additions and 1 deletions
|
@ -50,6 +50,12 @@ void *alloca ();
|
||||||
# endif /* HAVE_ALLOCA_H */
|
# endif /* HAVE_ALLOCA_H */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef BFD_TRUE_FALSE
|
||||||
|
#define boolean bfd_boolean
|
||||||
|
#define true TRUE
|
||||||
|
#define false FALSE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* bucomm.c */
|
/* bucomm.c */
|
||||||
void bfd_nonfatal PARAMS ((CONST char *));
|
void bfd_nonfatal PARAMS ((CONST char *));
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,12 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifndef BFD_TRUE_FALSE
|
||||||
|
#define boolean bfd_boolean
|
||||||
|
#define true TRUE
|
||||||
|
#define false FALSE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Routine used to read generic debugging information. */
|
/* Routine used to read generic debugging information. */
|
||||||
|
|
||||||
extern PTR read_debugging_info PARAMS ((bfd *, asymbol **, long));
|
extern PTR read_debugging_info PARAMS ((bfd *, asymbol **, long));
|
||||||
|
|
|
@ -2667,7 +2667,8 @@ pstack_install_segv_action( const char* path_format_)
|
||||||
if ((abfd = load_bfd(pid))==0)
|
if ((abfd = load_bfd(pid))==0)
|
||||||
fprintf(stderr, "BFD load failed..\n");
|
fprintf(stderr, "BFD load failed..\n");
|
||||||
else {
|
else {
|
||||||
long storage_needed = bfd_get_symtab_upper_bound (abfd);
|
long storage_needed= (bfd_get_file_flags(abfd) & HAS_SYMS) ?
|
||||||
|
bfd_get_symtab_upper_bound (abfd) : 0;
|
||||||
long i;
|
long i;
|
||||||
(void)i;
|
(void)i;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue