Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c26b0a1

Browse files
committed
Merge branch 'master' into autoprepare_extended
2 parents e2e4734 + 1d468b9 commit c26b0a1

File tree

1,047 files changed

+19457
-10205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,047 files changed

+19457
-10205
lines changed

.gitattributes

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
* whitespace=space-before-tab,trailing-space
22
*.[chly] whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4
3-
*.dsl whitespace=space-before-tab,trailing-space,tab-in-indent
4-
*.patch -whitespace
53
*.pl whitespace=space-before-tab,trailing-space,tabwidth=4
64
*.po whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eof
75
*.sgml whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol
@@ -19,6 +17,7 @@ src/backend/catalog/sql_features.txt whitespace=space-before-tab,blank-at-eof,-
1917
# Test output files that contain extra whitespace
2018
*.out -whitespace
2119
contrib/*/output/*.source -whitespace
20+
src/pl/plpgsql/src/output/*.source -whitespace
2221
src/test/regress/output/*.source -whitespace
2322
src/interfaces/ecpg/test/expected/* -whitespace
2423
src/interfaces/libpq/test/expected.out whitespace=-blank-at-eof

config/c-library.m4

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,14 @@ fi])# PGAC_VAR_INT_TIMEZONE
2626
# PGAC_STRUCT_TIMEZONE
2727
# ------------------
2828
# Figure out how to get the current timezone. If `struct tm' has a
29-
# `tm_zone' member, define `HAVE_TM_ZONE'. Also, if the
30-
# external array `tzname' is found, define `HAVE_TZNAME'.
31-
# This is the same as the standard macro AC_STRUCT_TIMEZONE, except that
32-
# tzname[] is checked for regardless of whether we find tm_zone.
29+
# `tm_zone' member, define `HAVE_STRUCT_TM_TM_ZONE'. Unlike the
30+
# standard macro AC_STRUCT_TIMEZONE, we don't check for `tzname[]' if
31+
# not found, since we don't use it. (We use `int timezone' as a
32+
# fallback.)
3333
AC_DEFUN([PGAC_STRUCT_TIMEZONE],
34-
[AC_REQUIRE([AC_STRUCT_TM])dnl
35-
AC_CHECK_MEMBERS([struct tm.tm_zone],,,[#include <sys/types.h>
36-
#include <$ac_cv_struct_tm>
37-
])
38-
if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
39-
AC_DEFINE(HAVE_TM_ZONE, 1,
40-
[Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
41-
`HAVE_STRUCT_TM_TM_ZONE' instead.])
42-
fi
43-
AC_CACHE_CHECK(for tzname, ac_cv_var_tzname,
44-
[AC_LINK_IFELSE([AC_LANG_PROGRAM(
45-
[[#include <stdlib.h>
34+
[AC_CHECK_MEMBERS([struct tm.tm_zone],,,[#include <sys/types.h>
4635
#include <time.h>
47-
#ifndef tzname /* For SGI. */
48-
extern char *tzname[]; /* RS6000 and others reject char **tzname. */
49-
#endif
50-
]],
51-
[atoi(*tzname);])], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)])
52-
if test $ac_cv_var_tzname = yes; then
53-
AC_DEFINE(HAVE_TZNAME, 1,
54-
[Define to 1 if you have the external array `tzname'.])
55-
fi
36+
])
5637
])# PGAC_STRUCT_TIMEZONE
5738

5839

0 commit comments

Comments
 (0)