diff options
author | Morten Welinder <terra@diku.dk> | 1994-10-17 08:42:36 +0000 |
---|---|---|
committer | Morten Welinder <terra@diku.dk> | 1994-10-17 08:42:36 +0000 |
commit | 4103a5ce4ee207d9e8b4bf44887ce9afcca5a604 (patch) | |
tree | a05182afeb77460c04635bb1eb65a345bbaffdfa /src/dispextern.h | |
parent | e15e6710b29fe48afba580041c98708c3168a1f8 (diff) | |
download | emacs-4103a5ce4ee207d9e8b4bf44887ce9afcca5a604.tar.gz |
*** empty log message ***
Diffstat (limited to 'src/dispextern.h')
-rw-r--r-- | src/dispextern.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 8d5f23ab2e2..d62797195ca 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -17,13 +17,22 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef _DISPEXTERN_H_ +#define _DISPEXTERN_H_ + /* Nonzero means last display completed and cursor is really at cursX, cursY. Zero means it was preempted. */ extern int display_completed; #ifdef HAVE_X_WINDOWS #include <X11/Xlib.h> +#endif + +#ifdef MSDOS +#include "msdos.h" +#endif +#ifdef HAVE_FACES struct face { /* If this is non-zero, it is a GC we can use without modification @@ -62,7 +71,7 @@ typedef struct face *FACE; #define FACE_STIPPLE(f) ((f)->stipple) #define FACE_UNDERLINE_P(f) ((f)->underline) -#else /* Not X */ +#else /* not HAVE_FACES */ typedef int FACE; @@ -73,7 +82,8 @@ typedef int FACE; #define FACE_HIGHLIGHT(f) ((f) & 0x1) #define FACE_UNDERLINE(f) ((f) & 0x2) -#endif /* Not X */ + +#endif /* not HAVE_FACES */ /* This structure is used for the actual display of text on a frame. @@ -164,3 +174,5 @@ struct frame_glyphs extern void get_display_line (); extern Lisp_Object sit_for (); + +#endif /* not _DISPEXTERN_H_ */ |