Config: CONFIG_DIRECT_IO moved to UCW namespace

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 778cbaab2b0267b69aabcc618dfa059008eb9f63..46c6fa40298e49b860b4a4dec536690d4db715e2 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -50,7 +50,7 @@ UnSet("CONFIG_UCW_DEFAULT_CONFIG");
 UnSet("CONFIG_UCW_ENV_VAR_CONFIG");
 
 # Allow use of direct IO on files
-Set("CONFIG_DIRECT_IO");
+Set("CONFIG_UCW_DIRECT_IO");
 Set("CONFIG_UCW_FB_DIRECT");
 
 # Use thread-local storage (needs GCC-support, default: auto-detect)

diff --git a/ucw/fb-param.c b/ucw/fb-param.c
index e8d035b22e39b022fd660e653554c187dab8f3ae..f9d2b0fa1eee4dec03312edaca79eb2183c0a44a 100644 (file)
--- a/ucw/fb-param.c
+++ b/ucw/fb-param.c
@@ -34,8 +34,8 @@ fbpar_cf_commit(struct fb_params *p UNUSED)
 #ifdef CONFIG_DARWIN
       return "Direct I/O is not supported on darwin";
 #endif
-#ifndef CONFIG_DIRECT_IO
-      return "Direct I/O disabled by configure switch -CONFIG_DIRECT_IO";
+#ifndef CONFIG_UCW_DIRECT_IO
+      return "Direct I/O disabled by configure switch -CONFIG_UCW_DIRECT_IO";
 #endif
 #ifndef CONFIG_UCW_FB_DIRECT
       return "Direct I/O disabled by configure switch -CONFIG_UCW_FB_DIRECT";

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index 84c20da00680e08c4eec9aa2f45674fba0a199eb..88dbfd52b7e1c31f4825679e42971d30f76c4c41 100644 (file)
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -256,10 +256,10 @@ if (IsSet("CONFIG_DARWIN")) {
        Append("COPT" => "-I/sw/include");
        # Fill in some constants not found in the system header files
        Set("SOL_TCP" => 6);            # missing in /usr/include/netinet/tcp.h
-       if (IsGiven("CONFIG_DIRECT_IO") && IsSet("CONFIG_DIRECT_IO")) {
+       if (IsGiven("CONFIG_UCW_DIRECT_IO") && IsSet("CONFIG_UCW_DIRECT_IO")) {
                Fail("Direct I/O is not available on darwin");
        } else {
-               UnSet("CONFIG_DIRECT_IO");
+               UnSet("CONFIG_UCW_DIRECT_IO");
        }
        if (!IsSet("CONFIG_POSIX_REGEX") && !IsSet("CONFIG_PCRE")) {
                Set("CONFIG_POSIX_REGEX" => 1);

diff --git a/ucw/perl/UCW/Configure/LibUCW.pm b/ucw/perl/UCW/Configure/LibUCW.pm
index c40b1cac5e25d5a727c960daade29e6b24710d3e..8653fcdb049ac98a2e93a391cc64fd6ce0b74fff 100644 (file)
--- a/ucw/perl/UCW/Configure/LibUCW.pm
+++ b/ucw/perl/UCW/Configure/LibUCW.pm
@@ -82,12 +82,12 @@ PostConfig {
        } if Get("CONFIG_INSTALL_API");
 
        # Include direct FB?
-       if (!IsSet("CONFIG_UCW_THREADS") || !IsSet("CONFIG_DIRECT_IO")) {
+       if (!IsSet("CONFIG_UCW_THREADS") || !IsSet("CONFIG_UCW_DIRECT_IO")) {
                if (IsGiven("CONFIG_UCW_FB_DIRECT") && IsSet("CONFIG_UCW_FB_DIRECT")) {
                        if (!IsSet("CONFIG_UCW_THREADS")) {
                                Fail("CONFIG_UCW_FB_DIRECT needs CONFIG_UCW_THREADS");
                        } else {
-                               Fail("CONFIG_UCW_FB_DIRECT needs CONFIG_DIRECT_IO");
+                               Fail("CONFIG_UCW_FB_DIRECT needs CONFIG_UCW_DIRECT_IO");
                        }
                }
                UnSet("CONFIG_UCW_FB_DIRECT");