HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.
[bpt/emacs.git]
/
m4
/
gettimeofday.m4
diff --git
a/m4/gettimeofday.m4
b/m4/gettimeofday.m4
index
3c05e59
..
1c2d66e
100644
(file)
--- a/
m4/gettimeofday.m4
+++ b/
m4/gettimeofday.m4
@@
-1,6
+1,6
@@
-# serial 2
0
+# serial 2
1
-# Copyright (C) 2001-2003, 2005, 2007, 2009-201
3
Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-201
4
Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@
-127,10
+127,8
@@
AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
])
AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
])
AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
- AC_DEFINE([gmtime], [rpl_gmtime],
- [Define to rpl_gmtime if the replacement function should be used.])
- AC_DEFINE([localtime], [rpl_localtime],
- [Define to rpl_localtime if the replacement function should be used.])
+ REPLACE_GMTIME=1
+ REPLACE_LOCALTIME=1
])
# Prerequisites of lib/gettimeofday.c.
])
# Prerequisites of lib/gettimeofday.c.