Attachment #26812 for bug #46175

View | Details | Raw Unified | Return to bug 46175
Collapse All | Expand All

Lines 74-80 Link Here

(-)apr-svn/test/Makefile.in (-2 / +2 lines)
74		74
75	# link programs using -no-install to get real executables not	75	# link programs using -no-install to get real executables not
76	# libtool wrapper scripts which link an executable when first run.	76	# libtool wrapper scripts which link an executable when first run.
77	LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \	77	LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
78	@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@	78	@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
79		79
80	# STDTEST_PORTABLE;	80	# STDTEST_PORTABLE;
Lines 129-135 Link Here
129	mod_test.la: $(OBJECTS_mod_test)	129	mod_test.la: $(OBJECTS_mod_test)
130	$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -module \	130	$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -module \
131	-avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ \	131	-avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ \
132	$(OBJECTS_mod_test)	132	$(OBJECTS_mod_test) $(LOCAL_LIBS)
133		133
134	OBJECTS_libmod_test = mod_test.lo $(LOCAL_LIBS)	134	OBJECTS_libmod_test = mod_test.lo $(LOCAL_LIBS)
135	libmod_test.la: $(OBJECTS_libmod_test)	135	libmod_test.la: $(OBJECTS_libmod_test)

Lines 472-477 Link Here

(-)apr-svn/include/apr.h.in (+16 lines)
472	*/	472	*/
473	#define APR_THREAD_FUNC @apr_thread_func@	473	#define APR_THREAD_FUNC @apr_thread_func@
474		474
		475	#if defined(DOXYGEN) \|\| !defined(WIN32)
		476
475	/**	477	/**
476	* The public APR functions are declared with APR_DECLARE(), so they may	478	* The public APR functions are declared with APR_DECLARE(), so they may
477	* use the most appropriate calling convention. Public APR functions with	479	* use the most appropriate calling convention. Public APR functions with
Lines 524-529 Link Here
524	*/	526	*/
525	#define APR_DECLARE_DATA	527	#define APR_DECLARE_DATA
526		528
		529	#elif defined(APR_DECLARE_STATIC)
		530	#define APR_DECLARE(type) type __stdcall
		531	#define APR_DECLARE_NONSTD(type) type __cdecl
		532	#define APR_DECLARE_DATA
		533	#elif defined(APR_DECLARE_EXPORT)
		534	#define APR_DECLARE(type) __declspec(dllexport) type __stdcall
		535	#define APR_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl
		536	#define APR_DECLARE_DATA __declspec(dllexport)
		537	#else
		538	#define APR_DECLARE(type) __declspec(dllimport) type __stdcall
		539	#define APR_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl
		540	#define APR_DECLARE_DATA __declspec(dllimport)
		541	#endif
		542
527	#if !defined(WIN32) \|\| defined(APU_MODULE_DECLARE_STATIC)	543	#if !defined(WIN32) \|\| defined(APU_MODULE_DECLARE_STATIC)
528	/**	544	/**
529	* Declare a dso module's exported module structure as APR_MODULE_DECLARE_DATA.	545	* Declare a dso module's exported module structure as APR_MODULE_DECLARE_DATA.

Lines 293-299 Link Here

(-)apr-svn/configure.in (-11 / +14 lines)
293	if test "x$use_libtool" = "xyes"; then	293	if test "x$use_libtool" = "xyes"; then
294	lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'	294	lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
295	LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"	295	LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
296	link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"	296	link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
297	so_ext='lo'	297	so_ext='lo'
298	lib_target='-rpath $(libdir) $(OBJECTS)'	298	lib_target='-rpath $(libdir) $(OBJECTS)'
299	export_lib_target='-rpath \$(libdir) \$(OBJECTS)'	299	export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
Lines 309-314 Link Here
309	-solaris2)	309	-solaris2)
310	apr_platform_runtime_link_flag="-R"	310	apr_platform_runtime_link_flag="-R"
311	;;	311	;;
		312	-mingw \| -cygwin)
		313	LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
		314	;;
312	*)	315	*)
313	;;	316	;;
314	esac	317	esac
Lines 443-448 Link Here
443	APR_SETVAR(CC,mwcc)	446	APR_SETVAR(CC,mwcc)
444	APR_SETVAR(AR,ar)	447	APR_SETVAR(AR,ar)
445	;;	448	;;
		449
		450	-mingw \| -cygwin)
		451	if test "$enable_shared" = yes; then
		452	APR_ADDTO(CPPFLAGS, -DAPR_DECLARE_EXPORT)
		453	else
		454	APR_ADDTO(CPPFLAGS, -DAPR_DECLARE_STATIC)
		455	fi
		456	;;
446	esac	457	esac
447		458
448	AC_CACHE_CHECK([whether the compiler provides atomic builtins], [ap_cv_atomic_builtins],	459	AC_CACHE_CHECK([whether the compiler provides atomic builtins], [ap_cv_atomic_builtins],
Lines 679-694 Link Here
679	dnl end up LIBS="-lm -lcrypt -lnsl -ldl" which is an annoyance.	690	dnl end up LIBS="-lm -lcrypt -lnsl -ldl" which is an annoyance.
680	case $host in	691	case $host in
681	-mingw)	692	-mingw)
682	dnl APR_ADDTO(LIBS,[-lmsvcrt --lshell32 -ladvapi32 -lws2_32])	693	APR_ADDTO(LIBS,[-lshell32 -ladvapi32 -lws2_32 -lrpcrt4 -lmswsock])
683		694	ac_cv_func_CreateFileMapping=yes
684	AC_CHECK_LIB(msvcrt, getpid)
685	APR_CHECK_DLL_FUNC(kernel32, SetErrorMode@4)
686	APR_CHECK_DLL_FUNC(advapi32, GetSecurityInfo@32)
687	APR_CHECK_DLL_FUNC(ws2_32, gethostbyname@4)
688	APR_CHECK_DLL_FUNC(shell32, CommandLineToArgvW@8)
689	APR_CHECK_DLL_FUNC(kernel32,[CreateFileMappingA@24],
690	[ac_cv_func_CreateFileMapping=$ac_cv_lib_kernel32_CreateFileMappingA])
691	APR_CHECK_DLL_FUNC(rpcrt4,[UuidCreate@4])
692	;;	695	;;
693	*)	696	*)
694	AC_SEARCH_LIBS(gethostbyname, nsl)	697	AC_SEARCH_LIBS(gethostbyname, nsl)

Lines 45-50 Link Here

(-)apr-svn/xml/apr_xml_internal.h (-1 / +1 lines)
45		45
46		46
47		47
48	apr_xml_parser apr_xml_parser_create_ex(apr_pool_t, void, void, void*);	48	APR_DECLARE(apr_xml_parser) apr_xml_parser_create_ex(apr_pool_t, void, void, void*);
49		49
50	#endif	50	#endif

Return to bug 46175