(EMACS_LISP_H): New.

(popup_activated_flag): Don't declare.

diff --git a/src/lisp.h b/src/lisp.h
index 9a80cb774fc83112784d71187556423bd5c8ba5e..4435090b4a84fde7edf3d095baf38e62b8c0b45e 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -19,6 +19,9 @@ 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.  */
 
+#ifndef EMACS_LISP_H
+#define EMACS_LISP_H
+
 /* Declare the prototype for a general external function.  */
 #if defined (PROTOTYPES) || defined (WINDOWSNT)
 #define P_(proto) proto
@@ -2976,7 +2979,6 @@ extern Lisp_Object next_single_char_property_change P_ ((Lisp_Object,
 EXFUN (Fx_popup_menu, 2);
 EXFUN (Fx_popup_dialog, 2);
 extern void syms_of_xmenu P_ ((void));
-extern int popup_activated_flag;
 
 /* defined in sysdep.c */
 extern void stuff_char P_ ((char c));
@@ -3160,3 +3162,5 @@ extern Lisp_Object Vdirectory_sep_char;
    (FIXNUM_OVERFLOW_P (val) \
     ? make_float (val) \
     : make_number ((EMACS_INT)(val)))
+
+#endif /* EMACS_LISP_H */