From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 20 May 2011 06:37:13 +0000 (-0700)
Subject: * systime.h (Time): Define only if emacs is defined.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=89d1bd225c6d3600ecf2d464a924cb0ef0af53e7;p=emacs.git

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

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