8000 Update this branch to match CVS head, includes WIN32 improvements. · codeimmortal/postgres@c40ed51 · GitHub
[go: up one dir, main page]
Skip to content

Commit c40ed51

Browse files
bmomjianbmomjian
committed
Update this branch to match CVS head, includes WIN32 improvements.
1 parent 432ca91 commit c40ed51

File tree

383 files changed

+81259
-83880
lines changed

Some content is hidden

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

383 files changed

+81259
-83880
lines changed

‎HISTORY

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ Add new DateStyle values MDY, DMY, and YMD, honor US and European for
212212
prepared statements) (Tom)
213213
Assume NaN value to be larger than any other value in MIN()/MAX() (Tom)
214214
Prevent interval from supressing ':00' seconds display
215+
New pg_get_triggerdef(prettyprint) and pg_constraint_is_visible() functions
215216

216217
_________________________________________________________________
217218

@@ -259,6 +260,10 @@ Allow pqInternalNotice() to accept a format string and args instead of
259260
just a preformatted message (Tom, Sean Chittenden)
260261
Allow control SSL negotiation with sslmode values "disable", "allow",
261262
"Prefer", and "require" (Jon Jensen)
263+
Allow new error codes and levels of text (Tom)
264+
Allow access to the underlying table and column of a query result (Tom)
265+
Allow access to the current transaction status (Tom)
266+
Add ability to pass binary data directly to the backend (Tom)
262267

263268
_________________________________________________________________
264269

‎config/ac_func_accept_argtypes.m4

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/config/ac_func_accept_argtypes.m4,v 1.4 2002/03/29 17:32:53 petere Exp $
1+
# $Header: /cvsroot/pgsql/config/ac_func_accept_argtypes.m4,v 1.4.4.1 2003/09/07 04:36:39 momjian Exp $
22
# This comes from the official Autoconf macro archive at
33
# <http://research.cys.de/autoconf-archive/>
44
# (I removed the $ before the Id CVS keyword below.)
@@ -7,9 +7,10 @@
77
dnl @synopsis AC_FUNC_ACCEPT_ARGTYPES
88
dnl
99
dnl Checks the data types of the three arguments to accept(). Results are
10-
dnl placed into the symbols ACCEPT_TYPE_ARG[123], consistent with the
11-
dnl following example:
10+
dnl placed into the symbols ACCEPT_TYPE_RETURN and ACCEPT_TYPE_ARG[123],
11+
dnl consistent with the following example:
1212
dnl
13+
dnl #define ACCEPT_TYPE_RETURN int
1314
dnl #define ACCEPT_TYPE_ARG1 int
1415
dnl #define ACCEPT_TYPE_ARG2 struct sockaddr *
1516
dnl #define ACCEPT_TYPE_ARG3 socklen_t
@@ -36,24 +37,29 @@ dnl
3637
# Solaris 7 and 8 have arg3 as 'void *' (disguised as 'Psocklen_t'
3738
# which is *not* 'socklen_t *'). If we detect that, then we assume
3839
# 'int' as the result, because that ought to work best.
40+
#
41+
# On Win32, accept() returns 'unsigned int PASCAL'
3942

4043
AC_DEFUN([AC_FUNC_ACCEPT_ARGTYPES],
4144
[AC_MSG_CHECKING([types of arguments for accept()])
42-
AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl
43-
[AC_CACHE_VAL(ac_cv_func_accept_arg2,dnl
44-
[AC_CACHE_VAL(ac_cv_func_accept_arg3,dnl
45-
[for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
46-
for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
47-
for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do
48-
AC_TRY_COMPILE(
45+
AC_CACHE_VAL(ac_cv_func_accept_return,dnl
46+
[AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl
47+
[AC_CACHE_VAL(ac_cv_func_accept_arg2,dnl
48+
[AC_CACHE_VAL(ac_cv_func_accept_arg3,dnl
49+
[for ac_cv_func_accept_return in 'int' 'unsigned int PASCAL'; do
50+
for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
51+
for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
52+
for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do
53+
AC_TRY_COMPILE(
4954
[#ifdef HAVE_SYS_TYPES_H
5055
#include <sys/types.h>
5156
#endif
5257
#ifdef HAVE_SYS_SOCKET_H
5358
#include <sys/socket.h>
5459
#endif
55-
extern int accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);],
56-
[], [ac_not_found=no; break 3], [ac_not_found=yes])
60+
extern $ac_cv_func_accept_return accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);],
61+
[], [ac_not_found=no; break 4], [ac_not_found=yes])
62+
done
5763
done
5864
done
5965
done
@@ -63,10 +69,13 @@ extern int accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func
6369
if test "$ac_cv_func_accept_arg3" = "void"; then
6470
ac_cv_func_accept_arg3=int
6571
fi
72+
])dnl AC_CACHE_VAL
6673
])dnl AC_CACHE_VAL
6774
])dnl AC_CACHE_VAL
6875
])dnl AC_CACHE_VAL
69-
AC_MSG_RESULT([$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *])
76+
AC_MSG_RESULT([$ac_cv_func_accept_return, $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *])
77+
AC_DEFINE_UNQUOTED(ACCEPT_TYPE_RETURN, $ac_cv_func_accept_return,
78+
[Define to the return type of 'accept'])
7079
AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG1, $ac_cv_func_accept_arg1,
7180
[Define to the type of arg 1 of 'accept'])
7281
AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG2, $ac_cv_func_accept_arg2,

‎config/python.m4

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Autoconf macros for configuring the build of Python extension modules
33
#
4-
# $Header: /cvsroot/pgsql/config/python.m4,v 1.5 2002/09/04 22:54:18 petere Exp $
4+
# $Header: /cvsroot/pgsql/config/python.m4,v 1.5.4.1 2003/09/07 04:36:39 momjian Exp $
55
#
66

77
# PGAC_PATH_PYTHON
@@ -26,19 +26,14 @@ python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
2626
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
2727
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
2828
python_configdir="${python_execprefix}/lib/python${python_version}/config"
29-
python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
30-
python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
3129
python_includespec="-I${python_prefix}/include/python${python_version}"
3230
if test "$python_prefix" != "$python_execprefix"; then
3331
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
3432
fi
3533
36-
AC_SUBST(python_version)[]dnl
3734
AC_SUBST(python_prefix)[]dnl
3835
AC_SUBST(python_execprefix)[]dnl
3936
AC_SUBST(python_configdir)[]dnl
40-
AC_SUBST(python_moduledir)[]dnl
41-
AC_SUBST(python_moduleexecdir)[]dnl
4237
AC_SUBST(python_includespec)[]dnl
4338
# This should be enough of a message.
4439
if test "$python_prefix" != "$python_execprefix"; then
@@ -49,19 +44,6 @@ fi
4944
])# _PGAC_CHECK_PYTHON_DIRS
5045

5146

52-
# PGAC_CHECK_PYTHON_MODULE_SETUP
53-
# ------------------------------
54-
# Finds things required to build a Python extension module.
55-
# This used to do more, that's why it's separate.
56-
#
57-
# It would be nice if we could check whether the current setup allows
58-
# the build of the shared module. Future project.
59-
AC_DEFUN([PGAC_CHECK_PYTHON_MODULE_SETUP],
60-
[
61-
AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
62-
])# PGAC_CHECK_PYTHON_MODULE_SETUP
63-
64-
6547
# PGAC_CHECK_PYTHON_EMBED_SETUP
6648
# -----------------------------
6749
# Courtesy of the INN 2.3.1 package...

0 commit comments

Comments
 (0)
0