mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-02 20:16:25 +00:00
Code Issues Releases Activity

* systime.h (Time): Define only if emacs is defined.

Browse Source 
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>.
This commit is contained in:
Paul Eggert 2011-05-19 23:37:13 -07:00
parent b018a6c910
commit 89d1bd225c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -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.

8
src/systime.h
View File

@ -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