apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r880643 - in /apr/apr/branches/1.4.x: configure.in include/apr.hw
Date Mon, 16 Nov 2009 07:45:38 GMT
Author: wrowe
Date: Mon Nov 16 07:45:28 2009
New Revision: 880643

URL: http://svn.apache.org/viewvc?rev=880643&view=rev
Log:
The native line ending on win32 -is- \r\n (just as OS2/Netware)

Modified:
    apr/apr/branches/1.4.x/configure.in
    apr/apr/branches/1.4.x/include/apr.hw

Modified: apr/apr/branches/1.4.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/configure.in?rev=880643&r1=880642&r2=880643&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/configure.in (original)
+++ apr/apr/branches/1.4.x/configure.in Mon Nov 16 07:45:28 2009
@@ -482,7 +482,7 @@
        ac_cv_func_setpgrp_void="no"
        apr_cv_tcp_nodelay_with_cork="no"
        enable_threads="system_threads"
-       eolstr="\\n"
+       eolstr="\\r\\n"
        file_as_socket=0
        proc_mutex_is_global=1
        OBJECTS_PLATFORM='$(OBJECTS_win32)'

Modified: apr/apr/branches/1.4.x/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.hw?rev=880643&r1=880642&r2=880643&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr.hw (original)
+++ apr/apr/branches/1.4.x/include/apr.hw Mon Nov 16 07:45:28 2009
@@ -124,83 +124,83 @@
 #endif
 
 #ifndef _WIN32_WCE
-#define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H        1
-#define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H        1
-#define APR_HAVE_DIRENT_H       0
-#define APR_HAVE_ERRNO_H        1
-#define APR_HAVE_FCNTL_H        1
-#define APR_HAVE_IO_H           1
-#define APR_HAVE_LIMITS_H       1
-#define APR_HAVE_NETDB_H        0
-#define APR_HAVE_NETINET_IN_H   0
-#define APR_HAVE_NETINET_SCTP_H 0
+#define APR_HAVE_ARPA_INET_H     0
+#define APR_HAVE_CONIO_H         1
+#define APR_HAVE_CRYPT_H         0
+#define APR_HAVE_CTYPE_H         1
+#define APR_HAVE_DIRENT_H        0
+#define APR_HAVE_ERRNO_H         1
+#define APR_HAVE_FCNTL_H         1
+#define APR_HAVE_IO_H            1
+#define APR_HAVE_LIMITS_H        1
+#define APR_HAVE_NETDB_H         0
+#define APR_HAVE_NETINET_IN_H    0
+#define APR_HAVE_NETINET_SCTP_H  0
 #define APR_HAVE_NETINET_SCTP_UIO_H 0
-#define APR_HAVE_NETINET_TCP_H  0
-#define APR_HAVE_PTHREAD_H      0
-#define APR_HAVE_SEMAPHORE_H    0
-#define APR_HAVE_SIGNAL_H       1
-#define APR_HAVE_STDARG_H       1
-#define APR_HAVE_STDINT_H       0
-#define APR_HAVE_STDIO_H        1
-#define APR_HAVE_STDLIB_H       1
-#define APR_HAVE_STRING_H       1
-#define APR_HAVE_STRINGS_H      0
-#define APR_HAVE_SYS_IOCTL_H    0
-#define APR_HAVE_SYS_SENDFILE_H 0
-#define APR_HAVE_SYS_SIGNAL_H   0
-#define APR_HAVE_SYS_SOCKET_H   0
-#define APR_HAVE_SYS_SOCKIO_H   0
+#define APR_HAVE_NETINET_TCP_H   0
+#define APR_HAVE_PTHREAD_H       0
+#define APR_HAVE_SEMAPHORE_H     0
+#define APR_HAVE_SIGNAL_H        1
+#define APR_HAVE_STDARG_H        1
+#define APR_HAVE_STDINT_H        0
+#define APR_HAVE_STDIO_H         1
+#define APR_HAVE_STDLIB_H        1
+#define APR_HAVE_STRING_H        1
+#define APR_HAVE_STRINGS_H       0
+#define APR_HAVE_SYS_IOCTL_H     0
+#define APR_HAVE_SYS_SENDFILE_H  0
+#define APR_HAVE_SYS_SIGNAL_H    0
+#define APR_HAVE_SYS_SOCKET_H    0
+#define APR_HAVE_SYS_SOCKIO_H    0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
-#define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H    1
-#define APR_HAVE_SYS_UIO_H      0
-#define APR_HAVE_SYS_UN_H       0
-#define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_TIME_H         1
-#define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_STDDEF_H       1
-#define APR_HAVE_PROCESS_H      1
-#else
-#define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H        0
-#define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H        0
-#define APR_HAVE_DIRENT_H       0
-#define APR_HAVE_ERRNO_H        0
-#define APR_HAVE_FCNTL_H        0
-#define APR_HAVE_IO_H           0
-#define APR_HAVE_LIMITS_H       0
-#define APR_HAVE_NETDB_H        0
-#define APR_HAVE_NETINET_IN_H   0
-#define APR_HAVE_NETINET_SCTP_H 0
+#define APR_HAVE_SYS_TIME_H      0
+#define APR_HAVE_SYS_TYPES_H     1
+#define APR_HAVE_SYS_UIO_H       0
+#define APR_HAVE_SYS_UN_H        0
+#define APR_HAVE_SYS_WAIT_H      0
+#define APR_HAVE_TIME_H          1
+#define APR_HAVE_UNISTD_H        0
+#define APR_HAVE_STDDEF_H        1
+#define APR_HAVE_PROCESS_H       1
+#else
+#define APR_HAVE_ARPA_INET_H     0
+#define APR_HAVE_CONIO_H         0
+#define APR_HAVE_CRYPT_H         0
+#define APR_HAVE_CTYPE_H         0
+#define APR_HAVE_DIRENT_H        0
+#define APR_HAVE_ERRNO_H         0
+#define APR_HAVE_FCNTL_H         0
+#define APR_HAVE_IO_H            0
+#define APR_HAVE_LIMITS_H        0
+#define APR_HAVE_NETDB_H         0
+#define APR_HAVE_NETINET_IN_H    0
+#define APR_HAVE_NETINET_SCTP_H  0
 #define APR_HAVE_NETINET_SCTP_UIO_H 0
-#define APR_HAVE_NETINET_TCP_H  0
-#define APR_HAVE_PTHREAD_H      0
-#define APR_HAVE_SEMAPHORE_H    0
-#define APR_HAVE_SIGNAL_H       0
-#define APR_HAVE_STDARG_H       0
-#define APR_HAVE_STDINT_H       0
-#define APR_HAVE_STDIO_H        1
-#define APR_HAVE_STDLIB_H       1
-#define APR_HAVE_STRING_H       1
-#define APR_HAVE_STRINGS_H      0
-#define APR_HAVE_SYS_IOCTL_H    0
-#define APR_HAVE_SYS_SENDFILE_H 0
-#define APR_HAVE_SYS_SIGNAL_H   0
-#define APR_HAVE_SYS_SOCKET_H   0
-#define APR_HAVE_SYS_SOCKIO_H   0
+#define APR_HAVE_NETINET_TCP_H   0
+#define APR_HAVE_PTHREAD_H       0 
+#define APR_HAVE_SEMAPHORE_H     0
+#define APR_HAVE_SIGNAL_H        0
+#define APR_HAVE_STDARG_H        0
+#define APR_HAVE_STDINT_H        0
+#define APR_HAVE_STDIO_H         1
+#define APR_HAVE_STDLIB_H        1
+#define APR_HAVE_STRING_H        1
+#define APR_HAVE_STRINGS_H       0
+#define APR_HAVE_SYS_IOCTL_H     0
+#define APR_HAVE_SYS_SENDFILE_H  0
+#define APR_HAVE_SYS_SIGNAL_H    0
+#define APR_HAVE_SYS_SOCKET_H    0
+#define APR_HAVE_SYS_SOCKIO_H    0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
-#define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H    0
-#define APR_HAVE_SYS_UIO_H      0
-#define APR_HAVE_SYS_UN_H       0
-#define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_TIME_H         0
-#define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_STDDEF_H       0
-#define APR_HAVE_PROCESS_H      0
+#define APR_HAVE_SYS_TIME_H      0
+#define APR_HAVE_SYS_TYPES_H     0
+#define APR_HAVE_SYS_UIO_H       0
+#define APR_HAVE_SYS_UN_H        0
+#define APR_HAVE_SYS_WAIT_H      0
+#define APR_HAVE_TIME_H          0
+#define APR_HAVE_UNISTD_H        0
+#define APR_HAVE_STDDEF_H        0
+#define APR_HAVE_PROCESS_H       0
 #endif
 
 /** @} */
@@ -247,94 +247,94 @@
 #define APR_HAVE_SHMEM_MMAP_ANON    0
 #define APR_HAVE_SHMEM_BEOS         0
 
-#define APR_USE_SHMEM_MMAP_TMP     0
-#define APR_USE_SHMEM_MMAP_SHM     0
-#define APR_USE_SHMEM_MMAP_ZERO    0
-#define APR_USE_SHMEM_SHMGET_ANON  0
-#define APR_USE_SHMEM_SHMGET       0
-#define APR_USE_SHMEM_MMAP_ANON    0
-#define APR_USE_SHMEM_BEOS         0
-
-#define APR_USE_FLOCK_SERIALIZE           0 
-#define APR_USE_POSIXSEM_SERIALIZE        0
-#define APR_USE_SYSVSEM_SERIALIZE         0
-#define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_SERIALIZE         0 
-
-#define APR_HAS_FLOCK_SERIALIZE           0
-#define APR_HAS_SYSVSEM_SERIALIZE         0
-#define APR_HAS_POSIXSEM_SERIALIZE        0
-#define APR_HAS_FCNTL_SERIALIZE           0
-#define APR_HAS_PROC_PTHREAD_SERIALIZE    0
-
-#define APR_PROCESS_LOCK_IS_GLOBAL        0
-
-#define APR_HAVE_CORKABLE_TCP   0
-#define APR_HAVE_GETRLIMIT      0
-#define APR_HAVE_ICONV          0
-#define APR_HAVE_IN_ADDR        1
-#define APR_HAVE_INET_ADDR      1
-#define APR_HAVE_INET_NETWORK   0
-#define APR_HAVE_IPV6           0
-#define APR_HAVE_MEMMOVE        1
-#define APR_HAVE_SETRLIMIT      0
-#define APR_HAVE_SIGACTION      0
-#define APR_HAVE_SIGSUSPEND     0
-#define APR_HAVE_SIGWAIT        0
-#define APR_HAVE_STRCASECMP     0
-#define APR_HAVE_STRDUP         1
-#define APR_HAVE_STRNCASECMP    0
-#define APR_HAVE_STRSTR         1
-#define APR_HAVE_MEMCHR         1
-#define APR_HAVE_STRUCT_RLIMIT  0
-#define APR_HAVE_UNION_SEMUN    0
-#define APR_HAVE_SCTP           0
-#define APR_HAVE_IOVEC          0
+#define APR_USE_SHMEM_MMAP_TMP      0
+#define APR_USE_SHMEM_MMAP_SHM      0
+#define APR_USE_SHMEM_MMAP_ZERO     0
+#define APR_USE_SHMEM_SHMGET_ANON   0
+#define APR_USE_SHMEM_SHMGET        0
+#define APR_USE_SHMEM_MMAP_ANON     0
+#define APR_USE_SHMEM_BEOS          0
+
+#define APR_USE_FLOCK_SERIALIZE     0 
+#define APR_USE_POSIXSEM_SERIALIZE  0
+#define APR_USE_SYSVSEM_SERIALIZE   0
+#define APR_USE_FCNTL_SERIALIZE     0
+#define APR_USE_PROC_PTHREAD_SERIALIZE 0 
+#define APR_USE_PTHREAD_SERIALIZE   0 
+
+#define APR_HAS_FLOCK_SERIALIZE     0
+#define APR_HAS_SYSVSEM_SERIALIZE   0
+#define APR_HAS_POSIXSEM_SERIALIZE  0
+#define APR_HAS_FCNTL_SERIALIZE     0
+#define APR_HAS_PROC_PTHREAD_SERIALIZE 0
+
+#define APR_PROCESS_LOCK_IS_GLOBAL  0
+
+#define APR_HAVE_CORKABLE_TCP       0
+#define APR_HAVE_GETRLIMIT          0
+#define APR_HAVE_ICONV              0
+#define APR_HAVE_IN_ADDR            1
+#define APR_HAVE_INET_ADDR          1
+#define APR_HAVE_INET_NETWORK       0
+#define APR_HAVE_IPV6               0
+#define APR_HAVE_MEMMOVE            1
+#define APR_HAVE_SETRLIMIT          0
+#define APR_HAVE_SIGACTION          0
+#define APR_HAVE_SIGSUSPEND         0
+#define APR_HAVE_SIGWAIT            0
+#define APR_HAVE_STRCASECMP         0
+#define APR_HAVE_STRDUP             1
+#define APR_HAVE_STRNCASECMP        0
+#define APR_HAVE_STRSTR             1
+#define APR_HAVE_MEMCHR             1
+#define APR_HAVE_STRUCT_RLIMIT      0
+#define APR_HAVE_UNION_SEMUN        0
+#define APR_HAVE_SCTP               0
+#define APR_HAVE_IOVEC              0
 
 #ifndef _WIN32_WCE
-#define APR_HAVE_STRICMP        1
-#define APR_HAVE_STRNICMP       1
+#define APR_HAVE_STRICMP            1
+#define APR_HAVE_STRNICMP           1
 #else
-#define APR_HAVE_STRICMP        0
-#define APR_HAVE_STRNICMP       0
+#define APR_HAVE_STRICMP            0
+#define APR_HAVE_STRNICMP           0
 #endif
 
 /*  APR Feature Macros */
-#define APR_HAS_SHARED_MEMORY     1
-#define APR_HAS_THREADS           1
-#define APR_HAS_MMAP              1
-#define APR_HAS_FORK              0
-#define APR_HAS_RANDOM            1
-#define APR_HAS_OTHER_CHILD       1
-#define APR_HAS_DSO               1
-#define APR_HAS_SO_ACCEPTFILTER   0
-#define APR_HAS_UNICODE_FS        1
-#define APR_HAS_PROC_INVOKED      1
-#define APR_HAS_OS_UUID           1
+#define APR_HAS_SHARED_MEMORY       1
+#define APR_HAS_THREADS             1
+#define APR_HAS_MMAP                1
+#define APR_HAS_FORK                0
+#define APR_HAS_RANDOM              1
+#define APR_HAS_OTHER_CHILD         1
+#define APR_HAS_DSO                 1
+#define APR_HAS_SO_ACCEPTFILTER     0
+#define APR_HAS_UNICODE_FS          1
+#define APR_HAS_PROC_INVOKED        1
+#define APR_HAS_OS_UUID             1
 
 #ifndef _WIN32_WCE
-#define APR_HAS_SENDFILE          1
-#define APR_HAS_USER              1
-#define APR_HAS_LARGE_FILES       1
-#define APR_HAS_XTHREAD_FILES     1
+#define APR_HAS_SENDFILE            1
+#define APR_HAS_USER                1
+#define APR_HAS_LARGE_FILES         1
+#define APR_HAS_XTHREAD_FILES       1
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
 #else
-#define APR_HAS_SENDFILE          0
-#define APR_HAS_USER              0
-#define APR_HAS_LARGE_FILES       0
-#define APR_HAS_XTHREAD_FILES     0
+#define APR_HAS_SENDFILE            0
+#define APR_HAS_USER                0
+#define APR_HAS_LARGE_FILES         0
+#define APR_HAS_XTHREAD_FILES       0
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
 #endif
 
 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
  * to poll on files/pipes.
  */
-#define APR_FILES_AS_SOCKETS      0
+#define APR_FILES_AS_SOCKETS        0
 
 /* This macro indicates whether or not EBCDIC is the native character set.
  */
-#define APR_CHARSET_EBCDIC        0
+#define APR_CHARSET_EBCDIC          0
 
 /* If we have a TCP implementation that can be "corked", what flag
  * do we use?
@@ -343,11 +343,11 @@
 
 /* Is the TCP_NODELAY socket option inherited from listening sockets?
  */
-#define APR_TCP_NODELAY_INHERITED 1
+#define APR_TCP_NODELAY_INHERITED   1
 
 /* Is the O_NONBLOCK flag inherited from listening sockets?
  */
-#define APR_O_NONBLOCK_INHERITED  1
+#define APR_O_NONBLOCK_INHERITED    1
 
 /* Typedefs that APR needs. */
 



Mime
View raw message