From owner-svn-src-vendor@freebsd.org Sun May 31 20:56:07 2020 Return-Path: Delivered-To: svn-src-vendor@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0A4012F0810; Sun, 31 May 2020 20:56:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ZrF26s2rz3cZm; Sun, 31 May 2020 20:56:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E630F1FCFA; Sun, 31 May 2020 20:56:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04VKu6dh077338; Sun, 31 May 2020 20:56:06 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04VKu5Kx077331; Sun, 31 May 2020 20:56:05 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005312056.04VKu5Kx077331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 31 May 2020 20:56:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r361666 - in vendor/apr/dist: . atomic/unix encoding file_io/unix include include/arch/unix include/private locks/unix misc/unix network_io/unix poll/unix strings threadproc/unix time/unix X-SVN-Group: vendor X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in vendor/apr/dist: . atomic/unix encoding file_io/unix include include/arch/unix include/private locks/unix misc/unix network_io/unix poll/unix strings threadproc/unix time/unix X-SVN-Commit-Revision: 361666 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 20:56:07 -0000 Author: dim Date: Sun May 31 20:56:05 2020 New Revision: 361666 URL: https://svnweb.freebsd.org/changeset/base/361666 Log: Vendor import apr-1.7.0 Added: vendor/apr/dist/atomic/unix/builtins64.c (contents, props changed) vendor/apr/dist/atomic/unix/mutex64.c (contents, props changed) vendor/apr/dist/encoding/apr_encode.c (contents, props changed) vendor/apr/dist/include/apr_encode.h (contents, props changed) vendor/apr/dist/include/private/apr_encode_private.h (contents, props changed) Modified: vendor/apr/dist/CHANGES vendor/apr/dist/Makefile.in vendor/apr/dist/NOTICE vendor/apr/dist/apr.dsp vendor/apr/dist/apr.mak vendor/apr/dist/apr.spec vendor/apr/dist/atomic/unix/ia32.c vendor/apr/dist/atomic/unix/mutex.c vendor/apr/dist/atomic/unix/ppc.c vendor/apr/dist/atomic/unix/s390.c vendor/apr/dist/atomic/unix/solaris.c vendor/apr/dist/build-outputs.mk vendor/apr/dist/buildconf vendor/apr/dist/configure vendor/apr/dist/configure.in vendor/apr/dist/encoding/apr_escape.c vendor/apr/dist/file_io/unix/dir.c vendor/apr/dist/include/apr.h.in vendor/apr/dist/include/apr.hnw vendor/apr/dist/include/apr.hw vendor/apr/dist/include/apr.hwc vendor/apr/dist/include/apr_atomic.h vendor/apr/dist/include/apr_escape.h vendor/apr/dist/include/apr_global_mutex.h vendor/apr/dist/include/apr_network_io.h vendor/apr/dist/include/apr_proc_mutex.h vendor/apr/dist/include/apr_thread_mutex.h vendor/apr/dist/include/apr_thread_proc.h vendor/apr/dist/include/apr_time.h vendor/apr/dist/include/apr_version.h vendor/apr/dist/include/arch/unix/apr_arch_atomic.h vendor/apr/dist/include/arch/unix/apr_arch_proc_mutex.h vendor/apr/dist/include/arch/unix/apr_arch_thread_mutex.h vendor/apr/dist/include/arch/unix/apr_private.h.in vendor/apr/dist/libapr.dsp vendor/apr/dist/libapr.mak vendor/apr/dist/locks/unix/global_mutex.c vendor/apr/dist/locks/unix/proc_mutex.c vendor/apr/dist/locks/unix/thread_cond.c vendor/apr/dist/locks/unix/thread_mutex.c vendor/apr/dist/misc/unix/rand.c vendor/apr/dist/network_io/unix/sockaddr.c vendor/apr/dist/poll/unix/port.c vendor/apr/dist/strings/apr_snprintf.c vendor/apr/dist/threadproc/unix/signals.c vendor/apr/dist/time/unix/time.c Modified: vendor/apr/dist/CHANGES ============================================================================== --- vendor/apr/dist/CHANGES Sun May 31 18:42:00 2020 (r361665) +++ vendor/apr/dist/CHANGES Sun May 31 20:56:05 2020 (r361666) @@ -1,132 +1,57 @@ -*- coding: utf-8 -*- -Changes for APR 1.6.5 +Changes for APR 1.7.0 - *) Fix Win32 build breakage in apr_os_exp_time_put() in 1.6.4. [Rainer Jung] - -Changes for APR 1.6.4 (not released) + *) apr_dir_read: [Unix] Dropped the preference of the dirread_r() flavor + for dirread(), because the former is both deprecated and unneeded. + [Yann Ylavic, William Rowe] - *) configure: Fix detection of on OpenBSD. - PR 61976. [David Carlier , Yann Ylavic] + *) apr_file_info: [Win32 only] Treat only "name surrogate" reparse points + as symlinks, and not other reparse tag types. PR47630 + [Oleg Liatte ] - *) Fix apr_parse_addr_port() regression in scope_id parsing introduced - in 1.6.3. [Rainer Jung] + *) Test %ld vs. %lld to avoid compiler emits using APR_OFF_T_FMT, in the + case of apparently equivilant long and long long types. [William Rowe] - *) Fix Win32 file buffer locking behavior for single threaded file streams. - [Evgeny Kotkov, Mladen Turk, Jean-Frederic Clere] + *) Recognize APPLE predefined macros as equivilant to DARWIN. [Jim Jagielski] - *) Numerous corrections to APR poll behavior. [Yann Ylavic] + *) Signals: Allow handling of SIGUSR2 in apr_signal_thread. [Yann Ylavic] -Changes for APR 1.6.3 + *) Atomics: Support for 64bit ints. [Jim Jagielski] - *) apr_file_trunc: Truncating a buffered file could add unexpected - data after the truncate position. PR 51017. - [Evgeny Kotkov ] + *) Add the apr_encode_* API that implements RFC4648 and RFC7515 + compliant BASE64, BASE64URL, BASE32, BASE32HEX and BASE16 + encode/decode functions. [Graham Leggett] - *) apr_file_trunc: Fix an issue where reading from a buffered file - after truncate could return stale data from the buffer. - [Evgeny Kotkov ] + *) rand: Use arc4random_buf() on BSD platforms and getrandom() on Linux, + when available. [Christian Weisgerber , Jeff Trawick] - - *) apr_table_overlap: Add APR_OVERLAP_TABLES_ADD to merge and set when - overlapping tables. [Graham Leggett] - *) locks: Introduce apr_{thread,proc,global}_mutex_timedlock(). [Yann Ylavic] - *) Introduce the apr_cstr_fn() family of functions, derived from - the svn_cstring_ functions of the Subversion project. +Changes for APR 1.6.x and later: - *) Add APR_SO_FREEBIND option for apr_socket_opt_set. PR 58725. - [Ashley GC, Jan Kaluza, Joe Orton] - - *) apr_filepath_merge: Fix truename length calculation on Windows - in cases where the "short" name variant is actually longer than - the "long" or "true" name. See: testnames.c:merge_shortname(). - [Bert Huijben ] - - *) apr_atomic: Fix errors when building on Visual Studio 2013 while - maintaining the ability to build on Visual Studio 6 with Windows - Server 2003 R2 SDK. PR 57191. [Gregg Smith] - - *) apr_skiplist: Add apr_skiplist_addne*() family to preserve existing - values (no duplicate), add apr_skiplist_size(), apr_skiplist_height() - and apr_skiplist_preheight() to get the corresponding current values, - and apr_skiplist_set_preheight() to modify it. [ Yann Ylavic ] - - *) Add new --enable-allocator-guard-pages which is like allocator-uses-mmap, - but will also add inaccessible guard pages before and after each memnode. - This will result in higher ressource usage but allow to find/protect - against certain buffer overflow/overread bugs. Under Linux, it may be - necessary to increase /proc/sys/vm/max_map_count . [Stefan Fritsch] - - *) apr_skiplist: Add apr_skiplist_add() to support multiple values. - - *) Add new --enable-pool-concurrency-check configure option to detect - thread-unsafe concurrent accesses to pools. Runtime costs should be - relatively low. [Stefan Fritsch] - - *) Add support code to teach valgrind about APR pools and allocators. - [Stefan Fritsch] - - *) Add apr_sockaddr_info_copy(), for making a deep copy of an - apr_sockaddr_t into a specified pool. [Yann Ylavic - ] - - *) Added Unix domain socket support. - [Mladen Turk] - - *) Add apr_shm_delete() to compliment apr_shm_remove(). - [Jim Jagielski] - - *) Intruduce APR_PERMS_SET macros for setting the owner/group on - objects. Currently only implemented for shm, proc and global - mutexes on posix platforms. - [Mladen Turk] - - *) Add apr_escape_ldap() and apr_pescape_ldap(), escaping characters - as described by RFC4514 and RFC4515 respectively. [Graham Leggett] + *) http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/CHANGES?view=markup Changes for APR 1.5.x and later: Modified: vendor/apr/dist/Makefile.in ============================================================================== --- vendor/apr/dist/Makefile.in Sun May 31 18:42:00 2020 (r361665) +++ vendor/apr/dist/Makefile.in Sun May 31 20:56:05 2020 (r361666) @@ -63,6 +63,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ datadir=@datadir@ installbuilddir=@installbuilddir@ @@ -92,8 +93,6 @@ install: $(TARGETS) $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \ done $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk - $(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir) - $(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir) $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG) @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ for i in $(INSTALL_SUBDIRS); do \ Modified: vendor/apr/dist/NOTICE ============================================================================== --- vendor/apr/dist/NOTICE Sun May 31 18:42:00 2020 (r361665) +++ vendor/apr/dist/NOTICE Sun May 31 20:56:05 2020 (r361666) @@ -1,5 +1,5 @@ Apache Portable Runtime -Copyright (c) 2000-2018 The Apache Software Foundation. +Copyright (c) 2000-2019 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: vendor/apr/dist/apr.dsp ============================================================================== --- vendor/apr/dist/apr.dsp Sun May 31 18:42:00 2020 (r361665) +++ vendor/apr/dist/apr.dsp Sun May 31 20:56:05 2020 (r361666) @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ LIB32=link.exe -lib # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -90,7 +90,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "x64\LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -114,7 +114,7 @@ LIB32=link.exe -lib # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -142,6 +142,10 @@ LIB32=link.exe -lib SOURCE=.\atomic\win32\apr_atomic.c # End Source File +# Begin Source File + +SOURCE=.\atomic\win32\apr_atomic64.c +# End Source File # End Group # Begin Group "dso" @@ -156,6 +160,11 @@ SOURCE=.\dso\win32\dso.c # PROP Default_Filter "" # Begin Source File +SOURCE=.\encoding\apr_encode.c + +# End Source File +# Begin Source File + SOURCE=.\encoding\apr_escape.c # End Source File @@ -423,6 +432,10 @@ SOURCE=.\shmem\win32\shm.c # Begin Source File SOURCE=.\strings\apr_cpystrn.c +# End Source File +# Begin Source File + +SOURCE=.\strings\apr_cstr.c # End Source File # Begin Source File Modified: vendor/apr/dist/apr.mak ============================================================================== --- vendor/apr/dist/apr.mak Sun May 31 18:42:00 2020 (r361665) +++ vendor/apr/dist/apr.mak Sun May 31 20:56:05 2020 (r361666) @@ -27,6 +27,9 @@ NULL= NULL=nul !ENDIF +CPP=cl.exe +RSC=rc.exe + !IF "$(CFG)" == "apr - Win32 Release" OUTDIR=.\LibR @@ -35,15 +38,17 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -ALL : ".\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -117,47 +122,11 @@ CLEAN : -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -166,7 +135,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -208,15 +179,15 @@ LIB32_OBJS= \ "$(INTDIR)\multicast.obj" \ "$(INTDIR)\sendrecv.obj" \ "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ "$(INTDIR)\socket_util.obj" \ + "$(INTDIR)\sockets.obj" \ "$(INTDIR)\sockopt.obj" \ "$(INTDIR)\apr_getpass.obj" \ "$(INTDIR)\poll.obj" \ "$(INTDIR)\pollcb.obj" \ "$(INTDIR)\pollset.obj" \ - "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\select.obj" \ + "$(INTDIR)\wakeup.obj" \ "$(INTDIR)\apr_random.obj" \ "$(INTDIR)\sha2.obj" \ "$(INTDIR)\sha2_glue.obj" \ @@ -253,15 +224,17 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -ALL : ".\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -335,47 +308,11 @@ CLEAN : -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -384,7 +321,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -426,8 +365,8 @@ LIB32_OBJS= \ "$(INTDIR)\multicast.obj" \ "$(INTDIR)\sendrecv.obj" \ "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ "$(INTDIR)\socket_util.obj" \ + "$(INTDIR)\sockets.obj" \ "$(INTDIR)\sockopt.obj" \ "$(INTDIR)\apr_getpass.obj" \ "$(INTDIR)\poll.obj" \ @@ -471,15 +410,17 @@ INTDIR=.\x64\LibR OutDir=.\x64\LibR # End Custom Macros -ALL : ".\x64\LibR\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -553,47 +494,11 @@ CLEAN : -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -602,7 +507,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -644,8 +551,8 @@ LIB32_OBJS= \ "$(INTDIR)\multicast.obj" \ "$(INTDIR)\sendrecv.obj" \ "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ "$(INTDIR)\socket_util.obj" \ + "$(INTDIR)\sockets.obj" \ "$(INTDIR)\sockopt.obj" \ "$(INTDIR)\apr_getpass.obj" \ "$(INTDIR)\poll.obj" \ @@ -689,15 +596,17 @@ INTDIR=.\x64\LibD OutDir=.\x64\LibD # End Custom Macros -ALL : ".\x64\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib" CLEAN : -@erase "$(INTDIR)\apr-1.idb" -@erase "$(INTDIR)\apr-1.pdb" -@erase "$(INTDIR)\apr_atomic.obj" + -@erase "$(INTDIR)\apr_atomic64.obj" -@erase "$(INTDIR)\apr_cpystrn.obj" -@erase "$(INTDIR)\apr_cstr.obj" + -@erase "$(INTDIR)\apr_encode.obj" -@erase "$(INTDIR)\apr_escape.obj" -@erase "$(INTDIR)\apr_fnmatch.obj" -@erase "$(INTDIR)\apr_getpass.obj" @@ -771,47 +680,12 @@ CLEAN : -@erase "$(INTDIR)\wakeup.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" - -@erase ".\include\apr_gen_test_char.h" - -@erase "$(OUTDIR)\gen_test_char.exe" - -@erase "$(OUTDIR)\gen_test_char.obj" + -@erase ".\include\apr_escape_test_char.h" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" BSC32_SBRS= \ @@ -820,7 +694,9 @@ LIB32=link.exe -lib LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" LIB32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ + "$(INTDIR)\apr_atomic64.obj" \ "$(INTDIR)\dso.obj" \ + "$(INTDIR)\apr_encode.obj" \ "$(INTDIR)\apr_escape.obj" \ "$(INTDIR)\buffer.obj" \ "$(INTDIR)\copy.obj" \ @@ -862,8 +738,8 @@ LIB32_OBJS= \ "$(INTDIR)\multicast.obj" \ "$(INTDIR)\sendrecv.obj" \ "$(INTDIR)\sockaddr.obj" \ - "$(INTDIR)\sockets.obj" \ "$(INTDIR)\socket_util.obj" \ + "$(INTDIR)\sockets.obj" \ "$(INTDIR)\sockopt.obj" \ "$(INTDIR)\apr_getpass.obj" \ "$(INTDIR)\poll.obj" \ @@ -901,7 +777,37 @@ LIB32_OBJS= \ !ENDIF +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + + !IF "$(NO_EXTERNAL_DEPS)" != "1" !IF EXISTS("apr.dep") !INCLUDE "apr.dep" @@ -914,444 +820,458 @@ LIB32_OBJS= \ !IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug" || "$(CFG)" == "apr - x64 Release" || "$(CFG)" == "apr - x64 Debug" SOURCE=.\atomic\win32\apr_atomic.c -"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=.\atomic\win32\apr_atomic64.c + +"$(INTDIR)\apr_atomic64.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=.\dso\win32\dso.c -"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=.\encoding\apr_encode.c + +"$(INTDIR)\apr_encode.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=.\encoding\apr_escape.c -"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_escape.h" ".\include\apr_escape_test_char.h" ".\include\apr.h" +"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\buffer.c -"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\unix\copy.c -"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\dir.c -"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\unix\fileacc.c -"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\filedup.c -"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\filepath.c -"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\unix\filepath_util.c -"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\filestat.c -"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\filesys.c -"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\flock.c -"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\unix\fullrw.c -"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\unix\mktemp.c -"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\open.c -"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\pipe.c -"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\readwrite.c -"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\win32\seek.c -"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\file_io\unix\tempdir.c -"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\locks\win32\proc_mutex.c -"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\locks\win32\thread_cond.c -"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\locks\win32\thread_mutex.c -"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\locks\win32\thread_rwlock.c -"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\memory\unix\apr_pools.c -"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\win32\apr_app.c SOURCE=.\misc\win32\charset.c -"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\win32\env.c -"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\unix\errorcodes.c -"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\unix\getopt.c -"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\win32\internal.c -"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\win32\misc.c -"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\unix\otherchild.c -"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\win32\rand.c -"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\win32\start.c -"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\win32\utf8.c -"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\misc\unix\version.c -"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\mmap\unix\common.c -"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\mmap\win32\mmap.c -"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\network_io\unix\inet_ntop.c -"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\network_io\unix\inet_pton.c -"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\network_io\unix\multicast.c -"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\network_io\win32\sendrecv.c -"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\network_io\unix\sockaddr.c -"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\network_io\unix\socket_util.c -"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***