Author: ivan
Date: Mon Sep 2 14:02:08 2024
New Revision: 1920404
URL: http://svn.apache.org/viewvc?rev=1920404&view=rev
Log:
win32: Remove Windows 9x support.
* CHANGES: Note that Windows 9x not supported.
* CMakeLists.txt: Do not set WINNT compile definition.
* libaprutil.rc: Remove condition for WINNT.
Modified:
apr/apr-util/branches/1.7.x/CHANGES
apr/apr-util/branches/1.7.x/CMakeLists.txt
apr/apr-util/branches/1.7.x/libaprutil.rc
Modified: apr/apr-util/branches/1.7.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/CHANGES?rev=1920404&r1=1920403&r2=1920404&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.7.x/CHANGES [utf-8] Mon Sep 2 14:02:08 2024
@@ -64,6 +64,8 @@ Changes with APR-util 1.7.0
*) New apr_crypto_prng API and apr_crypto_random[_thread]_bytes() functions.
[Yann Ylavic]
+ *) win32: Remove Windows 9x support.
+
Changes with APR-util 1.6.x and later:
*) http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/CHANGES?view=markup
Modified: apr/apr-util/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/CMakeLists.txt?rev=1920404&r1=1920403&r2=1920404&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Mon Sep 2 14:02:08 2024
@@ -274,8 +274,6 @@ SET(install_targets)
SET(install_bin_pdb)
SET(dbd_drivers)
-# Note: The WINNT definition on some targets is used only by libaprutil.rc.
-
IF (MSVC)
# Ignore Microsoft's interpretation of secure development
# and the POSIX string handling API
@@ -290,7 +288,7 @@ IF(APU_BUILD_SHARED)
TARGET_LINK_LIBRARIES(libaprutil-1
PRIVATE ${XMLLIB_LIBRARIES} ${APR_LIBRARIES})
TARGET_COMPILE_DEFINITIONS(libaprutil-1
- PRIVATE "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT"
+ PRIVATE "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC"
INTERFACE "APU_DECLARE_IMPORT")
ENDIF()
@@ -313,7 +311,6 @@ IF(APU_HAVE_CRYPTO)
SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
TARGET_INCLUDE_DIRECTORIES(apr_crypto_openssl-1
PRIVATE "${OPENSSL_INCLUDE_DIR}")
- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT")
TARGET_COMPILE_DEFINITIONS(apr_crypto_openssl-1
PRIVATE "DLL_NAME=apr_crypto_openssl")
@@ -329,7 +326,7 @@ IF(APU_HAVE_ODBC)
TARGET_LINK_LIBRARIES(apr_dbd_odbc-1
PRIVATE libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32)
SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APR_DECLARE_IMPORT;APU_DSO_MODULE_BUILD;WINNT")
+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APR_DECLARE_IMPORT;APU_DSO_MODULE_BUILD")
TARGET_COMPILE_DEFINITIONS(apr_dbd_odbc-1
PRIVATE "DLL_NAME=apr_dbd_odbc")
ENDIF()
@@ -341,7 +338,6 @@ IF(APR_HAS_LDAP)
SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1
PRIVATE ${APR_LIBRARIES} ${LDAP_LIBRARIES})
- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT")
TARGET_COMPILE_DEFINITIONS(apr_ldap-1
PRIVATE "DLL_NAME=apr_ldap")
Modified: apr/apr-util/branches/1.7.x/libaprutil.rc
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/libaprutil.rc?rev=1920404&r1=1920403&r2=1920404&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/libaprutil.rc (original)
+++ apr/apr-util/branches/1.7.x/libaprutil.rc Mon Sep 2 14:02:08 2024
@@ -39,11 +39,7 @@
FILEFLAGS 0x00L
#endif
#endif
-#if defined(WINNT) || defined(WIN64)
FILEOS 0x40004L
-#else
- FILEOS 0x4L
-#endif
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.