Commit 43db12f6 authored by unknown's avatar unknown
Browse files

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_3200/mysql-4.0

parents 41aa345d fc92acf4
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,12 @@ void *alloca ();
# endif /* HAVE_ALLOCA_H */
#endif

#ifndef BFD_TRUE_FALSE
#define boolean bfd_boolean
#define true TRUE
#define false FALSE
#endif

/* bucomm.c */
void bfd_nonfatal PARAMS ((CONST char *));

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@

#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.  */

extern PTR read_debugging_info PARAMS ((bfd *, asymbol **, long));
+2 −1
Original line number Diff line number Diff line
@@ -2667,7 +2667,8 @@ pstack_install_segv_action( const char* path_format_)
	if ((abfd = load_bfd(pid))==0)
		fprintf(stderr, "BFD load failed..\n");
	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;
		(void)i;