* include/grub/crypto.h: Don't declare gcry_log_bug, gcry_log_printf

	and gcry_log_bug.
	* grub-core/lib/libgcrypt_wrap/mem.c: Include g10lib.h

diff --git a/ChangeLog b/ChangeLog
index 8b458ca0637b6e4bce4b778fb3222f25386263e0..ddd6011908d459f6f1fff26cacfbb30d81fc8590 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/crypto.h: Don't declare gcry_log_bug, gcry_log_printf
+       and gcry_log_bug.
+       * grub-core/lib/libgcrypt_wrap/mem.c: Include g10lib.h
+
 2013-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * INSTALL: Document cross-compilation.

diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c
index 94f9d65d5d84430ac89ec611338a5a52ac286996..f9046f84007044ad258bb34088a6f81577fa9aac 100644 (file)
--- a/grub-core/lib/libgcrypt_wrap/mem.c
+++ b/grub-core/lib/libgcrypt_wrap/mem.c
@@ -1,4 +1,4 @@
-#include <grub/gcrypt/gcrypt.h>
+#include <grub/gcrypt/g10lib.h>
 #include <grub/gcrypt/gpg-error.h>
 #include <grub/term.h>
 #include <grub/crypto.h>

diff --git a/include/grub/crypto.h b/include/grub/crypto.h
index ea2f13e544378a6abf9da274320209675d97348c..ac201327067b568b73734f67b62795fef33051f1 100644 (file)
--- a/include/grub/crypto.h
+++ b/include/grub/crypto.h
@@ -401,10 +401,6 @@ void _gcry_assert_failed (const char *expr, const char *file, int line,
 
 void _gcry_burn_stack (int bytes);
 void _gcry_log_error( const char *fmt, ... )  __attribute__ ((format (printf, 1, 2)));
-void _gcry_log_bug( const char *fmt, ... )  __attribute__ ((format (printf, 1, 2)));
-void _gcry_log_printf( const char *fmt, ... )  __attribute__ ((format (printf, 1, 2)));
-void
-_gcry_check_heap (const void *a __attribute__ ((unused)));
 
 
 #ifdef GRUB_UTIL