Skip to content

Commit 9ddb870

Browse files
committed
windows: Remove HAVE_MINIDUMP_TYPE test
We've relied on it being present for msvc for ages... Reviewed-By: Thomas Munro <thomas.munro@gmail.com> Discussion: https://postgr.es/m/20220807012914.ydz73yte6j3coulo@awork3.anarazel.de
1 parent 320f92b commit 9ddb870

File tree

7 files changed

+2
-48
lines changed

7 files changed

+2
-48
lines changed

configure

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,6 @@ MSGFMT
648648
PG_CRC32C_OBJS
649649
CFLAGS_ARMV8_CRC32C
650650
CFLAGS_SSE42
651-
have_win32_dbghelp
652651
LIBOBJS
653652
ZSTD
654653
LZ4
@@ -16897,32 +16896,7 @@ esac
1689716896
;;
1689816897
esac
1689916898

16900-
ac_fn_c_check_type "$LINENO" "MINIDUMP_TYPE" "ac_cv_type_MINIDUMP_TYPE" "
16901-
#define WIN32_LEAN_AND_MEAN
16902-
#include <windows.h>
16903-
#include <string.h>
16904-
#include <dbghelp.h>
16905-
"
16906-
if test "x$ac_cv_type_MINIDUMP_TYPE" = xyes; then :
16907-
16908-
cat >>confdefs.h <<_ACEOF
16909-
#define HAVE_MINIDUMP_TYPE 1
16910-
_ACEOF
16911-
16912-
pgac_minidump_type=yes
16913-
else
16914-
pgac_minidump_type=no
1691516899
fi
16916-
16917-
fi
16918-
if test x"$pgac_minidump_type" = x"yes" ; then
16919-
have_win32_dbghelp=yes
16920-
16921-
else
16922-
have_win32_dbghelp=no
16923-
16924-
fi
16925-
1692616900
# Cygwin needs only a bit of that
1692716901
if test "$PORTNAME" = "cygwin"; then
1692816902
case " $LIBOBJS " in

configure.ac

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1937,18 +1937,7 @@ if test "$PORTNAME" = "win32"; then
19371937
AC_LIBOBJ(win32security)
19381938
AC_LIBOBJ(win32setlocale)
19391939
AC_LIBOBJ(win32stat)
1940-
AC_CHECK_TYPES(MINIDUMP_TYPE, [pgac_minidump_type=yes], [pgac_minidump_type=no], [
1941-
#define WIN32_LEAN_AND_MEAN
1942-
#include <windows.h>
1943-
#include <string.h>
1944-
#include <dbghelp.h>])
1945-
fi
1946-
if test x"$pgac_minidump_type" = x"yes" ; then
1947-
AC_SUBST(have_win32_dbghelp,yes)
1948-
else
1949-
AC_SUBST(have_win32_dbghelp,no)
19501940
fi
1951-
19521941
# Cygwin needs only a bit of that
19531942
if test "$PORTNAME" = "cygwin"; then
19541943
AC_LIBOBJ(dirmod)

src/Makefile.global.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,6 @@ host_cpu = @host_cpu@
547547
# Backend stack size limit has to be hard-wired on Windows (it's in bytes)
548548
WIN32_STACK_RLIMIT=4194304
549549

550-
# Set if we have a working win32 crashdump header
551-
have_win32_dbghelp = @have_win32_dbghelp@
552-
553550
DLSUFFIX = @DLSUFFIX@
554551

555552
# Pull in platform-specific magic

src/backend/main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ main(int argc, char *argv[])
6363
* If supported on the current platform, set up a handler to be called if
6464
* the backend/postmaster crashes with a fatal signal or exception.
6565
*/
66-
#if defined(WIN32) && defined(HAVE_MINIDUMP_TYPE)
66+
#if defined(WIN32)
6767
pgwin32_install_crashdump_handler();
6868
#endif
6969

src/backend/port/win32/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ top_builddir = ../../../..
1313
include $(top_builddir)/src/Makefile.global
1414

1515
OBJS = \
16+
crashdump.o \
1617
signal.o \
1718
socket.o \
1819
timer.o
19-
ifeq ($(have_win32_dbghelp), yes)
20-
OBJS += crashdump.o
21-
endif
2220

2321
include $(top_srcdir)/src/backend/common.mk

src/include/pg_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,6 @@
325325
/* Define to 1 if you have the `memset_s' function. */
326326
#undef HAVE_MEMSET_S
327327

328-
/* Define to 1 if the system has the type `MINIDUMP_TYPE'. */
329-
#undef HAVE_MINIDUMP_TYPE
330-
331328
/* Define to 1 if you have the `mkdtemp' function. */
332329
#undef HAVE_MKDTEMP
333330

src/tools/msvc/Solution.pm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ sub GenerateFiles
305305
HAVE_MBSTOWCS_L => 1,
306306
HAVE_MEMORY_H => 1,
307307
HAVE_MEMSET_S => undef,
308-
HAVE_MINIDUMP_TYPE => 1,
309308
HAVE_MKDTEMP => undef,
310309
HAVE_NETINET_TCP_H => undef,
311310
HAVE_NET_IF_H => undef,

0 commit comments

Comments
 (0)