Fix merge problem: make sf_malloc_cur_memory definitions match in headers and source

aa04f753 · Sergey Petrunia · d1e57a0f · aa04f753
Commit aa04f753 authored Aug 20, 2008 by Sergey Petrunia
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/my_sys.h include/my_sys.h +1 -1

No files found.
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -246,7 +246,7 @@ extern int NEAR my_umask,		/* Default creation mask  */
 	   NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */
 	   NEAR my_dont_interrupt;	/* call remember_intr when set */
 extern my_bool NEAR mysys_uses_curses, my_use_symdir;
-extern ulong sf_malloc_cur_memory, sf_malloc_max_memory;
+extern size_t sf_malloc_cur_memory, sf_malloc_max_memory;

 extern ulong	my_default_record_cache_size;
 extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,