[Emacs-diffs] /srv/bzr/emacs/trunk r104294: * systime.h (Time): Define only if emacs is defined.

[Paul Eggert]

------------------------------------------------------------
revno: 104294
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-19 23:37:13 -0700
message:
  * 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>.
modified:
  src/ChangeLog
  src/systime.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-20 00:54:09 +0000
+++ b/src/ChangeLog     2011-05-20 06:37:13 +0000
@@ -1,3 +1,10 @@
+2011-05-20  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * composite.c (find_automatic_composition): Fix previous change.

=== modified file 'src/systime.h'
--- a/src/systime.h     2011-05-12 20:23:33 +0000
+++ b/src/systime.h     2011-05-20 06:37:13 +0000
@@ -30,10 +30,12 @@
 #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