diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-19 23:37:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-19 23:37:13 -0700 |
| commit | 89d1bd225c6d3600ecf2d464a924cb0ef0af53e7 (patch) | |
| tree | c79c54673d9aaa65334d61ab8ac1a8b71a69fbe0 /src | |
| parent | b018a6c910d3b0bce7286485ea74e4925ffe53da (diff) | |
| download | emacs-89d1bd225c6d3600ecf2d464a924cb0ef0af53e7.tar.gz | |
* 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
<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | 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 <eggert@cs.ucla.edu> + + * 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 + <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>. + 2011-05-20 Kenichi Handa <handa@m17n.org> * 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 <http://www.gnu.org/licenses/>. */ #endif #endif -#ifdef HAVE_X_WINDOWS -# include <X11/X.h> -#else +#ifdef emacs +# ifdef HAVE_X_WINDOWS +# include <X11/X.h> +# else typedef unsigned long Time; +# endif #endif #ifdef HAVE_TZNAME |