Commit 16dccfae authored by vva@eagle.mysql.r18.ru's avatar vva@eagle.mysql.r18.ru

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_1661/mysql-4.1
parents 18d722ff 9b54c1bf
...@@ -50,6 +50,12 @@ void *alloca (); ...@@ -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 @@ ...@@ -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_) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment