(DECODE_EMACS_MULE_COMPOSITION_CHAR): Fix decoding

[gnu-emacs] / src / atimer.h

diff --git a/src/atimer.h b/src/atimer.h
index f7074f383db5af554c8e6b8037e3802282381184..84b1383ffdf84257fc6bf673145bf137cbc4d8bd 100644 (file)
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -1,5 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,15 +16,19 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_ATIMER_H
 #define EMACS_ATIMER_H
 
-/* Building alloca.o includes us, and we need lisp.h for the P_ macro
-   in that case.  */
-#include "lisp.h"
+/* Declare the prototype for a general external function.  */
+#if defined (PROTOTYPES) || defined (WINDOWSNT)
+#define P_(proto) proto
+#else
+#define P_(proto) ()
+#endif
+
 #include "systime.h"           /* for EMACS_TIME */
 
 /* Forward declaration.  */