aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-31 20:32:40 +0000
committerGerd Moellmann2001-01-31 20:32:40 +0000
commit843c999901def3fef669f6006bd41931df75dc92 (patch)
tree71f982a6c31d1b972caa5b82171aa8dd9e9c1ae6
parent7442878f82e55dfbc8372e025ab63a59bd2ae03f (diff)
downloademacs-843c999901def3fef669f6006bd41931df75dc92.tar.gz
emacs-843c999901def3fef669f6006bd41931df75dc92.zip
(EMACS_FRAME_H_INCLUDED): Use an include blocker
identifier which is not reserved by Standard C.
-rw-r--r--src/frame.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/frame.h b/src/frame.h
index ccbb29c2f23..947f7a5f6b6 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -18,10 +18,12 @@ along with GNU Emacs; see the file COPYING. If not, write to
18the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 18the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19Boston, MA 02111-1307, USA. */ 19Boston, MA 02111-1307, USA. */
20 20
21/* Don't multiply include: dispextern.h includes macterm.h which includes frame.h 21/* Don't multiply include: dispextern.h includes macterm.h which
22 some emacs source includes both dispextern.h and frame.h */ 22 includes frame.h some emacs source includes both dispextern.h and
23#ifndef _XFRAME_H_ 23 frame.h */
24#define _XFRAME_H_ 24
25#ifndef EMACS_FRAME_H_INCLUDED
26#define EMACS_FRAME_H_INCLUDED
25 27
26 28
27/* Miscellanea. */ 29/* Miscellanea. */
@@ -781,4 +783,4 @@ extern Lisp_Object selected_frame;
781 ? make_float ((double) (Y) / CANON_Y_UNIT (F)) \ 783 ? make_float ((double) (Y) / CANON_Y_UNIT (F)) \
782 : make_number ((Y) / CANON_Y_UNIT (F))) 784 : make_number ((Y) / CANON_Y_UNIT (F)))
783 785
784#endif /* not defined _FRAME_H_ */ 786#endif /* not EMACS_FRAME_H_INCLUDED */