* mail/hashcash.el (declare-function):

* net/imap.el (declare-function): New no-op macro for backward
compatibility.

3 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 638fdbae06b..ec7ce254dae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,13 @@
+2007-12-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * mail/hashcash.el (declare-function):
+        * net/imap.el (declare-function): New no-op macro for backward
+        compatibility.
+
 2007-12-08  Eli Zaretskii  <eliz@gnu.org>
 
         Sync makefile.w32-in with Makefile.in.
-        
+
         * makefile.w32-in (check-declare): New target.
         (BYTE_COMPILE_EXTRA_FLAGS): New variable.
         (.el.elc, compile-CMD, compile-SH, compile-always-CMD)
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 22005ce957e..1f4483a7c94 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -49,6 +49,9 @@
 
 ;;; Code:
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (defgroup hashcash nil
   "Hashcash configuration."
   :group 'mail)
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 8e41c68720b..85af73972fe 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -140,6 +140,7 @@
 
 (eval-when-compile (require 'cl))
 (eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   (autoload 'starttls-open-stream "starttls")
   (autoload 'starttls-negotiate "starttls")
   (autoload 'sasl-find-mechanism "sasl")