commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r816716 - in /commons/sandbox/runtime/trunk/src/main/native: configure include/acr_file.h include/arch/windows/acr_arch.h include/arch/windows/acr_arch_private.h
Date Fri, 18 Sep 2009 16:55:36 GMT
Author: mturk
Date: Fri Sep 18 16:55:36 2009
New Revision: 816716

URL: http://svn.apache.org/viewvc?rev=816716&view=rev
Log:
Remove check for fileextd.lib

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure
    commons/sandbox/runtime/trunk/src/main/native/include/acr_file.h
    commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
    commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=816716&r1=816715&r2=816716&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Fri Sep 18 16:55:36 2009
@@ -796,7 +796,6 @@
 test ".$sizeof_long_double" = .0 && have_long_double=0
 
 if [ ".$host" = .windows ]; then
-    have_fileextd=`have_include fileextd`
     have_ktmw32=`have_include ktmw32`
     have_aio=0
     have_libaio=0
@@ -807,7 +806,6 @@
     have_mmap64=0
     have_fdatasync=0
 else
-    have_fileextd=0
     have_ktmw32=0
     have_off64t=1
     sizeof_off64_t=`check_sizeof off64_t`
@@ -855,15 +853,15 @@
 
 if [ ".$has_openssl" = .yes ]; then
     test ".$openssl_inc" != . && varadds includes "-I$openssl_inc"
-    if $is_unix; then
-        test ".$openssl_lib" != . && varadds sslflags "-L$openssl_lib"
-        varadds sslflags -lssl -lcrypto
-    else
+    if [ ".$host" = .windows ]; then
         test ".$openssl_lib" != . && varadds sslflags "/libpath:\"$openssl_lib\""
         varadds sslflags libeay32.lib ssleay32.lib
+    else
+        test ".$openssl_lib" != . && varadds sslflags "-L$openssl_lib"
+        varadds sslflags -lssl -lcrypto
     fi
     have_openssl=1
-    modules="\$(SSLMODLIB)"
+    varadds modules '??(SSLMODLIB)'
     have_ocsp=`have_include openssl/ocsp`
 else
     have_ocsp=0
@@ -884,7 +882,6 @@
 #endif
 
 #define HAVE_WINDOWS_H        $have_windows
-#define HAVE_FILEEXTD_H       $have_fileextd
 #define HAVE_KTMW32_H         $have_ktmw32
 #define HAVE_AIO_H            $have_aio
 #define HAVE_LIBAIO_H         $have_libaio
@@ -965,6 +962,7 @@
 
 shflags=`echo $shflags | sed 's/??/\\$/g'`
 exflags=`echo $exflags | sed 's/??/\\$/g'`
+modules=`echo $modules | sed 's/??/\\$/g'`
 
 for m in $makefiles
 do

Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_file.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_file.h?rev=816716&r1=816715&r2=816716&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_file.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_file.h Fri Sep 18 16:55:36 2009
@@ -158,18 +158,34 @@
             (P)[_s] =  L'\0';                       \
     } else (void)0
 
+typedef struct acr_file_t {
+#if defined(WIN32)
+    OVERLAPPED   overlap;              /**< OVERLAPPED structure.
+                                          Must be first stuct element so we
+                                          can pass this structure directly
+                                          to the completion routines.   */
+#endif
+    acr_pchar_t *name;                  /**< Real file name             */
+    acr_osd_t    fd;                    /**< Os file descriptor         */
+    int          type;                  /**< File type. see ACR_FT      */
+    int          eof;                   /**< Non zero if file hit EOF   */
+    acr_uint32_t flags;                 /**< File flags                 */
+    acr_time_t   timeout;               /**< I/O timeout                */
+    enum {
+        BLK_UNKNOWN,
+        BLK_OFF,
+        BLK_ON
+    }            blocking;              /**< Blocking mode              */
+
+    /* The rest of the structure is platform specific.
+     */
+#if defined(WIN32)
 
-typedef struct acr_file_t acr_file_t;
-
-struct acr_file_t {
-#if defined (WIN32)
-    HANDLE       fd;        /* Os file descriptor   */
 #else
-    int          fd;
+
 #endif
-    acr_pchar_t *name;      /* Real file name       */
 
-};
+} acr_file_t;
 
 /** Get FileType
  * @param env JNI environment to use. If NULL no exception will be thrown

Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h?rev=816716&r1=816715&r2=816716&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h Fri Sep
18 16:55:36 2009
@@ -773,17 +773,6 @@
 #undef  JVM_DumpAllStacks
 #define JVM_DumpAllStacks acr_winapi_JVM_DumpAllStacks
 
-#if HAVE_FILEEXTD_H
-ACR_DECLARE_LATE_DLL_FUNC(SYSDLL_KERNEL32, BOOL, FALSE,
-                          WINAPI, GetFileInformationByHandleEx, 0, (
-    IN  HANDLE hFile,
-    IN  FILE_INFO_BY_HANDLE_CLASS FileInformationClass,
-    IN LPVOID lpFileInformation,
-    IN  DWORD dwBufferSize),
-    (hFile, FileInformationClass, lpFileInformation, dwBufferSize))
-#define GetFileInformationByHandleEx acr_winapi_GetFileInformationByHandleEx
-#endif
-
 #undef ACR_WANT_LATE_DLL
 #endif /* ACR_WANT_LATE_DLL */
 

Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h?rev=816716&r1=816715&r2=816716&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
Fri Sep 18 16:55:36 2009
@@ -40,17 +40,6 @@
 #define ACR_HAVE_VISTA_SDK  0
 #endif
 
-#if HAVE_FILEEXTD_H
-#if !defined (NTDDI_VISTA)
-#include <fileextd.h>
-#define HAVE_FILEEXTD_LIB   1
-#endif
-#elif _WIN32_WINNT >= 0x0600
-#undef HAVE_FILEEXTD_H
-#define HAVE_FILEEXTD_H     1
-#define HAVE_FILEEXTD_LIB   0
-#endif
-
 #if !defined (VER_SUITE_WH_SERVER)
 #define VER_SUITE_WH_SERVER         0x00008000
 #endif



Mime
View raw message