aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-08-02 17:42:11 -0700
committerPaul Eggert2012-08-02 17:42:11 -0700
commitf35ef0edeeef54286775c79ddf0df7b1e5f26a25 (patch)
tree971e8189b7eb311602b988f721fb466164933632
parent79ea6c20c483991e1be356be10aa27f92329d47e (diff)
downloademacs-f35ef0edeeef54286775c79ddf0df7b1e5f26a25.tar.gz
emacs-f35ef0edeeef54286775c79ddf0df7b1e5f26a25.zip
Merge from gnulib.
2012-08-02 stat-time, timespec, u64: support naive out-of-dir builds
-rw-r--r--ChangeLog5
-rw-r--r--lib/stat-time.c2
-rw-r--r--lib/timespec.c2
-rw-r--r--lib/u64.c2
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d6d75963de2..7a0e4874d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12012-08-03 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2012-08-02 stat-time, timespec, u64: support naive out-of-dir builds
5
12012-08-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62012-08-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * lib/Makefile.am (DEFAULT_INCLUDES): Add -I$(top_srcdir)/lib for 8 * lib/Makefile.am (DEFAULT_INCLUDES): Add -I$(top_srcdir)/lib for
diff --git a/lib/stat-time.c b/lib/stat-time.c
index 1a907ef250b..81b83ddb4fe 100644
--- a/lib/stat-time.c
+++ b/lib/stat-time.c
@@ -1,3 +1,3 @@
1#include <config.h> 1#include <config.h>
2#define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE 2#define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE
3#include <stat-time.h> 3#include "stat-time.h"
diff --git a/lib/timespec.c b/lib/timespec.c
index 16a77647228..2b6098ed7bd 100644
--- a/lib/timespec.c
+++ b/lib/timespec.c
@@ -1,3 +1,3 @@
1#include <config.h> 1#include <config.h>
2#define _GL_TIMESPEC_INLINE _GL_EXTERN_INLINE 2#define _GL_TIMESPEC_INLINE _GL_EXTERN_INLINE
3#include <timespec.h> 3#include "timespec.h"
diff --git a/lib/u64.c b/lib/u64.c
index 30dcb45b61f..04cf7a29946 100644
--- a/lib/u64.c
+++ b/lib/u64.c
@@ -1,3 +1,3 @@
1#include <config.h> 1#include <config.h>
2#define _GL_U64_INLINE _GL_EXTERN_INLINE 2#define _GL_U64_INLINE _GL_EXTERN_INLINE
3#include <u64.h> 3#include "u64.h"