Config: Moved CONFIG_LARGE_FILES to UCW namespace, removed CONFIG_LFS

diff --git a/free/libs/default.cfg b/free/libs/default.cfg
index be9f0a3b3ec6e20e6316a838c99810a7a96a1e9b..81a4ab12d4216a8f57d05571da6c22711956d6d2 100644 (file)
--- a/free/libs/default.cfg
+++ b/free/libs/default.cfg
@@ -7,7 +7,7 @@ Set("CONFIG_SHARED");
 Set("CONFIG_INSTALL_API");
 
 # Libucw should support files >2GB and threading
-Set("CONFIG_LARGE_FILES");
+Set("CONFIG_UCW_LARGE_FILES");
 Set("CONFIG_UCW_THREADS" => 1);
 
 # Libucw extensions

diff --git a/free/libucw/default.cfg b/free/libucw/default.cfg
index 2c9527e450e6a104426a55f39e5a22fc2232843b..17588251f9512b264b6de09b9bed088d51410dde 100644 (file)
--- a/free/libucw/default.cfg
+++ b/free/libucw/default.cfg
@@ -7,7 +7,7 @@ Set("CONFIG_SHARED");
 Set("CONFIG_INSTALL_API");
 
 # Libucw should support files >2GB and threading
-Set("CONFIG_LARGE_FILES");
+Set("CONFIG_UCW_LARGE_FILES");
 Set("CONFIG_UCW_THREADS" => 1);
 
 # Libucw extensions

diff --git a/ucw/config.h b/ucw/config.h
index a43e9ea5e2bde7454bae1c67fcd2bf729928f5cb..127c8ac945c5abfdf75cf3ba30f3198f90b0fb9c 100644 (file)
--- a/ucw/config.h
+++ b/ucw/config.h
@@ -1,7 +1,7 @@
 /*
  *     UCW Library -- Configuration-Dependent Definitions
  *
- *     (c) 1997--2009 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2012 Martin Mares <mj@ucw.cz>
  *     (c) 2006 Robert Spalek <robert@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
@@ -40,8 +40,8 @@ typedef unsigned int uns;             /** A better pronounceable alias for `unsigned int` *
 typedef u32 ucw_time_t;                        /** Seconds since UNIX epoch **/
 typedef s64 timestamp_t;               /** Milliseconds since UNIX epoch **/
 
-#ifdef CONFIG_LARGE_FILES
-typedef s64 ucw_off_t;                 /** File position (either 32- or 64-bit, depending on `CONFIG_LARGE_FILES`). **/
+#ifdef CONFIG_UCW_LARGE_FILES
+typedef s64 ucw_off_t;                 /** File position (either 32- or 64-bit, depending on `CONFIG_UCW_LARGE_FILES`). **/
 #else
 typedef s32 ucw_off_t;
 #endif

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 625c4cbd8c0f2192f4d20195c4c96192e10a80c4..63a0ef8a8a995a3a583ce45c4ef9eb161ef3f77a 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -12,7 +12,7 @@ UnSet("CONFIG_DEBUG");
 UnSet("CONFIG_EXACT_CPU");
 
 # Support files >2GB
-Set("CONFIG_LARGE_FILES");
+Set("CONFIG_UCW_LARGE_FILES");
 
 # Use shared libraries
 UnSet("CONFIG_SHARED");

diff --git a/ucw/io.h b/ucw/io.h
index 01d077994b15b40ee232a67a126fc074a68514c9..a1e4c6bd9876f3d33ea46a1e8ffc401fd9a6e3c1 100644 (file)
--- a/ucw/io.h
+++ b/ucw/io.h
@@ -13,7 +13,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#ifdef CONFIG_LFS
+#ifdef CONFIG_UCW_LARGE_FILES
 
 #define ucw_open open64
 #define ucw_seek lseek64
@@ -27,7 +27,7 @@
 #define ucw_fstat fstat64
 typedef struct stat64 ucw_stat_t;
 
-#else  /* !CONFIG_LFS */
+#else  /* !CONFIG_UCW_LARGE_FILES */
 
 #define ucw_open open
 #define ucw_seek(f,o,w) lseek(f,o,w)
@@ -39,7 +39,7 @@ typedef struct stat64 ucw_stat_t;
 #define ucw_fstat fstat
 typedef struct stat ucw_stat_t;
 
-#endif /* !CONFIG_LFS */
+#endif /* !CONFIG_UCW_LARGE_FILES */
 
 #if defined(_POSIX_SYNCHRONIZED_IO) && (_POSIX_SYNCHRONIZED_IO > 0)
 #define ucw_fdatasync fdatasync

diff --git a/ucw/perl/UCW/Configure/LibUCW.pm b/ucw/perl/UCW/Configure/LibUCW.pm
index 8653fcdb049ac98a2e93a391cc64fd6ce0b74fff..a35ca87b5904fa0f5c1181161ef3387032d0d5db 100644 (file)
--- a/ucw/perl/UCW/Configure/LibUCW.pm
+++ b/ucw/perl/UCW/Configure/LibUCW.pm
@@ -23,11 +23,6 @@ Test("CPU_PAGE_SIZE", "Determining page size", sub {
        return $p;
 });
 
-if (IsSet("CONFIG_LARGE_FILES") && IsSet("CONFIG_LINUX")) {
-       # Use 64-bit versions of file functions
-       Set("CONFIG_LFS");
-}
-
 # Decide how will ucw/partmap.c work
 Set("CONFIG_UCW_PARTMAP_IS_MMAP") if IsSet("CPU_64BIT_POINTERS");