Sorry, I messed up the subject line - this is a standalone patch. On 18/5/21 12:26 am, Mark Harmstone wrote: > This is the counterpart to srv.h, used to create extended stored > procedures for MSSQL. > > Signed-off-by: Mark Harmstone <m...@harmstone.com> > --- > mingw-w64-crt/Makefile.in | 98 ++++++++++++++++---------------- > mingw-w64-crt/aclocal.m4 | 17 ++++-- > mingw-w64-crt/configure.ac | 10 ++-- > mingw-w64-crt/lib32/Makefile.am | 1 + > mingw-w64-crt/lib64/Makefile.am | 1 + > mingw-w64-crt/lib64/opends60.def | 82 ++++++++++++++++++++++++++ > 6 files changed, 148 insertions(+), 61 deletions(-) > create mode 100644 mingw-w64-crt/lib64/opends60.def > > diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in > index ebf602c1b..8d3c797cc 100644 > --- a/mingw-w64-crt/Makefile.in > +++ b/mingw-w64-crt/Makefile.in > @@ -1,4 +1,4 @@ > -# Makefile.in generated by automake 1.16.3 from Makefile.am. > +# Makefile.in generated by automake 1.16.2 from Makefile.am. > # @configure_input@ > > # Copyright (C) 1994-2020 Free Software Foundation, Inc. > @@ -10762,7 +10762,6 @@ am__set_TESTS_bases = \ > bases='$(TEST_LOGS)'; \ > bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ > bases=`echo $$bases` > -AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' > RECHECK_LOGS = $(TEST_LOGS) > am__EXEEXT_7 = > TEST_SUITE_LOG = test-suite.log > @@ -10811,8 +10810,6 @@ am__post_remove_distdir = $(am__remove_distdir) > DIST_ARCHIVES = $(distdir).tar.gz > GZIP_ENV = --best > DIST_TARGETS = dist-gzip > -# Exists only to be overridden by the user if desired. > -AM_DISTCHECK_DVI_TARGET = dvi > distuninstallcheck_listfiles = find . -type f -print > am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ > | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' > @@ -10847,8 +10844,10 @@ DLLTOOL = @DLLTOOL@ > ECHO_C = @ECHO_C@ > ECHO_N = @ECHO_N@ > ECHO_T = @ECHO_T@ > +EGREP = @EGREP@ > EXEEXT = @EXEEXT@ > GENLIB = @GENLIB@ > +GREP = @GREP@ > INSTALL = @INSTALL@ > INSTALL_DATA = @INSTALL_DATA@ > INSTALL_PROGRAM = @INSTALL_PROGRAM@ > @@ -11619,15 +11618,15 @@ src_intrincsarm64 = > @LIB32_TRUE@ lib32/liboleacc.a lib32/liboleaut32.a \ > @LIB32_TRUE@ lib32/libolecli32.a lib32/liboledlg.a \ > @LIB32_TRUE@ lib32/libolepro32.a lib32/libolesvr32.a \ > -@LIB32_TRUE@ lib32/libolethk32.a lib32/libopengl32.a \ > -@LIB32_TRUE@ lib32/libp2p.a lib32/libp2pcollab.a \ > -@LIB32_TRUE@ lib32/libp2pgraph.a lib32/libpathcch.a \ > -@LIB32_TRUE@ lib32/libpcwum.a lib32/libpdh.a lib32/libpdhui.a \ > -@LIB32_TRUE@ lib32/libpenwin32.a lib32/libpkpd32.a \ > -@LIB32_TRUE@ lib32/libpowrprof.a lib32/libprntvpt.a \ > -@LIB32_TRUE@ lib32/libpropsys.a lib32/libpsapi.a \ > -@LIB32_TRUE@ lib32/libquartz.a lib32/libqutil.a \ > -@LIB32_TRUE@ lib32/libqwave.a lib32/librapi.a \ > +@LIB32_TRUE@ lib32/libolethk32.a lib32/libopends60.a \ > +@LIB32_TRUE@ lib32/libopengl32.a lib32/libp2p.a \ > +@LIB32_TRUE@ lib32/libp2pcollab.a lib32/libp2pgraph.a \ > +@LIB32_TRUE@ lib32/libpathcch.a lib32/libpcwum.a lib32/libpdh.a \ > +@LIB32_TRUE@ lib32/libpdhui.a lib32/libpenwin32.a \ > +@LIB32_TRUE@ lib32/libpkpd32.a lib32/libpowrprof.a \ > +@LIB32_TRUE@ lib32/libprntvpt.a lib32/libpropsys.a \ > +@LIB32_TRUE@ lib32/libpsapi.a lib32/libquartz.a \ > +@LIB32_TRUE@ lib32/libqutil.a lib32/libqwave.a lib32/librapi.a \ > @LIB32_TRUE@ lib32/librasapi32.a lib32/librasdlg.a \ > @LIB32_TRUE@ lib32/libresutil.a lib32/librpcdce4.a \ > @LIB32_TRUE@ lib32/librpcdiag.a lib32/librpchttp.a \ > @@ -12091,37 +12090,38 @@ src_intrincsarm64 = > @LIB64_TRUE@ lib64/liboleaut32.a lib64/libolecli32.a \ > @LIB64_TRUE@ lib64/libolecnv32.a lib64/liboledb32.a \ > @LIB64_TRUE@ lib64/liboledlg.a lib64/libolesvr32.a \ > -@LIB64_TRUE@ lib64/libopengl32.a lib64/libosuninst.a \ > -@LIB64_TRUE@ lib64/libpathcch.a lib64/libpautoenr.a \ > -@LIB64_TRUE@ lib64/libpdh.a lib64/libperfctrs.a \ > -@LIB64_TRUE@ lib64/libperfdisk.a lib64/libperfnet.a \ > -@LIB64_TRUE@ lib64/libperfos.a lib64/libperfproc.a \ > -@LIB64_TRUE@ lib64/libperfts.a lib64/libphotowiz.a \ > -@LIB64_TRUE@ lib64/libpidgen.a lib64/libpintlcsd.a \ > -@LIB64_TRUE@ lib64/libpolicman.a lib64/libpolstore.a \ > -@LIB64_TRUE@ lib64/libpowrprof.a lib64/libprintui.a \ > -@LIB64_TRUE@ lib64/libprntvpt.a lib64/libprofmap.a \ > -@LIB64_TRUE@ lib64/libpropsys.a lib64/libPS5UI.a \ > -@LIB64_TRUE@ lib64/libpsapi.a lib64/libpsbase.a \ > -@LIB64_TRUE@ lib64/libpschdprf.a lib64/libPSCRIPT5.a \ > -@LIB64_TRUE@ lib64/libpstorec.a lib64/libpstorsvc.a \ > -@LIB64_TRUE@ lib64/libqmgr.a lib64/libqosname.a \ > -@LIB64_TRUE@ lib64/libquartz.a lib64/libquery.a \ > -@LIB64_TRUE@ lib64/librasadhlp.a lib64/librasapi32.a \ > -@LIB64_TRUE@ lib64/librasauto.a lib64/libraschap.a \ > -@LIB64_TRUE@ lib64/librasctrs.a lib64/librasdlg.a \ > -@LIB64_TRUE@ lib64/librasman.a lib64/librasmans.a \ > -@LIB64_TRUE@ lib64/librasmontr.a lib64/librasmxs.a \ > -@LIB64_TRUE@ lib64/librasppp.a lib64/librasrad.a \ > -@LIB64_TRUE@ lib64/librassapi.a lib64/librasser.a \ > -@LIB64_TRUE@ lib64/librastapi.a lib64/librastls.a \ > -@LIB64_TRUE@ lib64/librdpcfgex.a lib64/librdpsnd.a \ > -@LIB64_TRUE@ lib64/librdpwsx.a lib64/libregapi.a \ > -@LIB64_TRUE@ lib64/libregsvc.a lib64/libresutils.a \ > -@LIB64_TRUE@ lib64/libriched20.a lib64/librnr20.a \ > -@LIB64_TRUE@ lib64/libroutetab.a lib64/librpcns4.a \ > -@LIB64_TRUE@ lib64/librpcref.a lib64/librpcrt4.a \ > -@LIB64_TRUE@ lib64/librpcss.a lib64/librsaenh.a lib64/librtm.a \ > +@LIB64_TRUE@ lib64/libopends60.a lib64/libopengl32.a \ > +@LIB64_TRUE@ lib64/libosuninst.a lib64/libpathcch.a \ > +@LIB64_TRUE@ lib64/libpautoenr.a lib64/libpdh.a \ > +@LIB64_TRUE@ lib64/libperfctrs.a lib64/libperfdisk.a \ > +@LIB64_TRUE@ lib64/libperfnet.a lib64/libperfos.a \ > +@LIB64_TRUE@ lib64/libperfproc.a lib64/libperfts.a \ > +@LIB64_TRUE@ lib64/libphotowiz.a lib64/libpidgen.a \ > +@LIB64_TRUE@ lib64/libpintlcsd.a lib64/libpolicman.a \ > +@LIB64_TRUE@ lib64/libpolstore.a lib64/libpowrprof.a \ > +@LIB64_TRUE@ lib64/libprintui.a lib64/libprntvpt.a \ > +@LIB64_TRUE@ lib64/libprofmap.a lib64/libpropsys.a \ > +@LIB64_TRUE@ lib64/libPS5UI.a lib64/libpsapi.a \ > +@LIB64_TRUE@ lib64/libpsbase.a lib64/libpschdprf.a \ > +@LIB64_TRUE@ lib64/libPSCRIPT5.a lib64/libpstorec.a \ > +@LIB64_TRUE@ lib64/libpstorsvc.a lib64/libqmgr.a \ > +@LIB64_TRUE@ lib64/libqosname.a lib64/libquartz.a \ > +@LIB64_TRUE@ lib64/libquery.a lib64/librasadhlp.a \ > +@LIB64_TRUE@ lib64/librasapi32.a lib64/librasauto.a \ > +@LIB64_TRUE@ lib64/libraschap.a lib64/librasctrs.a \ > +@LIB64_TRUE@ lib64/librasdlg.a lib64/librasman.a \ > +@LIB64_TRUE@ lib64/librasmans.a lib64/librasmontr.a \ > +@LIB64_TRUE@ lib64/librasmxs.a lib64/librasppp.a \ > +@LIB64_TRUE@ lib64/librasrad.a lib64/librassapi.a \ > +@LIB64_TRUE@ lib64/librasser.a lib64/librastapi.a \ > +@LIB64_TRUE@ lib64/librastls.a lib64/librdpcfgex.a \ > +@LIB64_TRUE@ lib64/librdpsnd.a lib64/librdpwsx.a \ > +@LIB64_TRUE@ lib64/libregapi.a lib64/libregsvc.a \ > +@LIB64_TRUE@ lib64/libresutils.a lib64/libriched20.a \ > +@LIB64_TRUE@ lib64/librnr20.a lib64/libroutetab.a \ > +@LIB64_TRUE@ lib64/librpcns4.a lib64/librpcref.a \ > +@LIB64_TRUE@ lib64/librpcrt4.a lib64/librpcss.a \ > +@LIB64_TRUE@ lib64/librsaenh.a lib64/librtm.a \ > @LIB64_TRUE@ lib64/librtutils.a lib64/libsamlib.a \ > @LIB64_TRUE@ lib64/libsamsrv.a lib64/libsapi.a \ > @LIB64_TRUE@ lib64/libscarddlg.a lib64/libsccbase.a \ > @@ -75511,7 +75511,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) > test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ > fi; \ > echo "$${col}$$br$${std}"; \ > - echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; > \ > + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ > echo "$${col}$$br$${std}"; \ > create_testsuite_report --maybe-color; \ > echo "$$col$$br$$std"; \ > @@ -76167,7 +76167,7 @@ distcheck: dist > $(DISTCHECK_CONFIGURE_FLAGS) \ > --srcdir=../.. --prefix="$$dc_install_base" \ > && $(MAKE) $(AM_MAKEFLAGS) \ > - && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ > + && $(MAKE) $(AM_MAKEFLAGS) dvi \ > && $(MAKE) $(AM_MAKEFLAGS) check \ > && $(MAKE) $(AM_MAKEFLAGS) install \ > && $(MAKE) $(AM_MAKEFLAGS) installcheck \ > @@ -76230,8 +76230,7 @@ installdirs: > done > install: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) install-am > -install-exec: $(BUILT_SOURCES) > - $(MAKE) $(AM_MAKEFLAGS) install-exec-am > +install-exec: install-exec-am > install-data: install-data-am > uninstall: uninstall-am > > @@ -83419,8 +83418,7 @@ uninstall-am: uninstall-crt32DATA uninstall-crt64DATA > \ > uninstall-libarm32LIBRARIES uninstall-libarm64DATA \ > uninstall-libarm64LIBRARIES > > -.MAKE: all check check-am install install-am install-exec \ > - install-strip > +.MAKE: all check check-am install install-am install-strip > > .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \ > check-TESTS check-am clean clean-checkLIBRARIES \ > diff --git a/mingw-w64-crt/aclocal.m4 b/mingw-w64-crt/aclocal.m4 > index 968c9a316..08199b420 100644 > --- a/mingw-w64-crt/aclocal.m4 > +++ b/mingw-w64-crt/aclocal.m4 > @@ -1,4 +1,4 @@ > -# generated automatically by aclocal 1.16.3 -*- Autoconf -*- > +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- > > # Copyright (C) 1996-2020 Free Software Foundation, Inc. > > @@ -14,8 +14,8 @@ > m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], > [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) > m4_ifndef([AC_AUTOCONF_VERSION], > [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl > -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, > -[m4_warning([this file was generated for autoconf 2.71. > +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, > +[m4_warning([this file was generated for autoconf 2.69. > You have another version of autoconf. It may work, but is not guaranteed to. > If you have problems, you may need to regenerate the build system entirely. > To do so, use the procedure documented by the package, typically > 'autoreconf'.])]) > @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], > [am__api_version='1.16' > dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to > dnl require some minimum version. Point them to the right macro. > -m4_if([$1], [1.16.3], [], > +m4_if([$1], [1.16.2], [], > [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl > ]) > > @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) > # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. > # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. > AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], > -[AM_AUTOMAKE_VERSION([1.16.3])dnl > +[AM_AUTOMAKE_VERSION([1.16.2])dnl > m4_ifndef([AC_AUTOCONF_VERSION], > [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl > _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) > @@ -856,7 +856,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN], > [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl > AC_REQUIRE_AUX_FILE([missing])dnl > if test x"${MISSING+set}" != xset; then > - MISSING="\${SHELL} '$am_aux_dir/missing'" > + case $am_aux_dir in > + *\ * | *\ *) > + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; > + *) > + MISSING="\${SHELL} $am_aux_dir/missing" ;; > + esac > fi > # Use eval to expand $SHELL > if eval "$MISSING --is-lightweight"; then > diff --git a/mingw-w64-crt/configure.ac b/mingw-w64-crt/configure.ac > index 26545a44c..b63e30587 100644 > --- a/mingw-w64-crt/configure.ac > +++ b/mingw-w64-crt/configure.ac > @@ -327,7 +327,7 @@ AC_CHECK_HEADER([_mingw_mac.h], [], [AC_MSG_ERROR([Please > check if the mingw-w64 > #Warnings and errors, default level is 3 > AC_MSG_CHECKING([for warning levels]) > AC_ARG_ENABLE([warnings], > - [AS_HELP_STRING([[--enable-warnings[=0-5]]], > + [AS_HELP_STRING([[--enable-warnings[=0-5]]], > [Enable compile time warnings @<:@default=3@:>@])], > [AS_CASE([$enableval], > [yes], [warning_level=3], > @@ -344,16 +344,16 @@ AS_CASE([$warning_level], > ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra" > ADD_C_ONLY_WARNING_FLAGS="-Wimplicit-function-declaration"], > [2],[ > - ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing > -Wshadow -Wpacked -Winline" > + ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing > -Wshadow -Wpacked -Winline" > ADD_C_ONLY_WARNING_FLAGS="-Wimplicit-function-declaration"], > [3],[ > - ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing > -Wshadow -Wpacked -Winline" > + ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing > -Wshadow -Wpacked -Winline" > ADD_C_ONLY_WARNING_FLAGS="-Wimplicit-function-declaration > -Wmissing-noreturn -Wmissing-prototypes"], > [4],[ > - ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing=2 > -Wsystem-headers -Wshadow -Wmissing-declarations -Wpacked -Winline -Werror > -pedantic" > + ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing=2 > -Wsystem-headers -Wshadow -Wmissing-declarations -Wpacked -Winline -Werror > -pedantic" > ADD_C_ONLY_WARNING_FLAGS="-Wimplicit-function-declaration > -Wmissing-noreturn -Wmissing-prototypes"], > [5],[ > - ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing=2 > -Wsystem-headers -Wshadow -Wmissing-declarations -Wpacked -Wredundant-decls > -Winline -Werror -Wfatal-errors -pedantic -pedantic-errors" > + ADD_C_CXX_WARNING_FLAGS="-Wall -Wextra -Wformat -Wstrict-aliasing=2 > -Wsystem-headers -Wshadow -Wmissing-declarations -Wpacked -Wredundant-decls > -Winline -Werror -Wfatal-errors -pedantic -pedantic-errors" > ADD_C_ONLY_WARNING_FLAGS="-Wimplicit-function-declaration > -Wmissing-noreturn -Wmissing-prototypes"] > ) > > diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am > index 683618ade..37bd3ceb5 100644 > --- a/mingw-w64-crt/lib32/Makefile.am > +++ b/mingw-w64-crt/lib32/Makefile.am > @@ -220,6 +220,7 @@ lib32_DATA += %reldir%/liboledlg.a > lib32_DATA += %reldir%/libolepro32.a > lib32_DATA += %reldir%/libolesvr32.a > lib32_DATA += %reldir%/libolethk32.a > +lib32_DATA += %reldir%/libopends60.a > lib32_DATA += %reldir%/libopengl32.a > lib32_DATA += %reldir%/libp2p.a > lib32_DATA += %reldir%/libp2pcollab.a > diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am > index 5d01aa702..349c2228d 100644 > --- a/mingw-w64-crt/lib64/Makefile.am > +++ b/mingw-w64-crt/lib64/Makefile.am > @@ -448,6 +448,7 @@ lib64_DATA += %reldir%/libolecnv32.a > lib64_DATA += %reldir%/liboledb32.a > lib64_DATA += %reldir%/liboledlg.a > lib64_DATA += %reldir%/libolesvr32.a > +lib64_DATA += %reldir%/libopends60.a > lib64_DATA += %reldir%/libopengl32.a > lib64_DATA += %reldir%/libosuninst.a > lib64_DATA += %reldir%/libpathcch.a > diff --git a/mingw-w64-crt/lib64/opends60.def > b/mingw-w64-crt/lib64/opends60.def > new file mode 100644 > index 000000000..28b064e58 > --- /dev/null > +++ b/mingw-w64-crt/lib64/opends60.def > @@ -0,0 +1,82 @@ > +LIBRARY OPENDS60.dll > +EXPORTS > +ODS_init > +srv_thread > +int_getpOAInfo > +int_setpOAInfo > +srv_IgnoreAnsiToOem > +srv_ackattention > +srv_alloc > +srv_ansi_describe > +srv_ansi_paramdata > +srv_ansi_sendmsg > +srv_ansi_sendrow > +srv_bmove > +srv_bzero > +srv_clearstatistics > +srv_config > +srv_config_alloc > +srv_convert > +srv_describe > +srv_errhandle > +srv_event > +srv_eventdata > +srv_flush > +srv_free > +srv_get_text > +srv_getbindtoken > +srv_getconfig > +srv_getdtcxact > +srv_getserver > +srv_getuserdata > +srv_got_attention > +srv_handle > +srv_impersonate_client > +srv_init > +srv_iodead > +srv_langcpy > +srv_langlen > +srv_langptr > +srv_log > +srv_message_handler > +srv_paramdata > +srv_paraminfo > +srv_paramlen > +srv_parammaxlen > +srv_paramname > +srv_paramnumber > +srv_paramset > +srv_paramsetoutput > +srv_paramstatus > +srv_paramtype > +srv_pfield > +srv_pfieldex > +srv_post_completion_queue > +srv_post_handle > +srv_pre_handle > +srv_returnval > +srv_revert_to_self > +srv_rpcdb > +srv_rpcname > +srv_rpcnumber > +srv_rpcoptions > +srv_rpcowner > +srv_rpcparams > +srv_run > +srv_senddone > +srv_sendmsg > +srv_sendrow > +srv_sendstatistics > +srv_sendstatus > +srv_setcoldata > +srv_setcollen > +srv_setevent > +srv_setuserdata > +srv_setutype > +srv_sfield > +srv_symbol > +srv_tdsversion > +srv_terminatethread > +srv_willconvert > +srv_writebuf > +srv_wsendmsg
_______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public