From 89d1bd225c6d3600ecf2d464a924cb0ef0af53e7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 19 May 2011 23:37:13 -0700 Subject: [PATCH] * systime.h (Time): Define only if emacs is defined. This is to allow ../lib-src/profile.c to be compiled on FreeBSD, where the include path doesn't have X11/X.h by default. See . --- src/ChangeLog | 7 +++++++ src/systime.h | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 989ecce9d2a..eed82fc865b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2011-05-20 Paul Eggert + + * systime.h (Time): Define only if emacs is defined. + This is to allow ../lib-src/profile.c to be compiled on FreeBSD, + where the include path doesn't have X11/X.h by default. See + . + 2011-05-20 Kenichi Handa * composite.c (find_automatic_composition): Fix previous change. diff --git a/src/systime.h b/src/systime.h index db43b26dc5e..bed9ed4aa71 100644 --- a/src/systime.h +++ b/src/systime.h @@ -30,10 +30,12 @@ along with GNU Emacs. If not, see . */ #endif #endif -#ifdef HAVE_X_WINDOWS -# include -#else +#ifdef emacs +# ifdef HAVE_X_WINDOWS +# include +# else typedef unsigned long Time; +# endif #endif #ifdef HAVE_TZNAME -- 2.39.2