From: Martin Mares <mj@ucw.cz>
Date: Sat, 11 Feb 2012 18:34:36 +0000 (+0100)
Subject: Config: CONFIG_DIRECT_IO moved to UCW namespace
X-Git-Tag: v5.0~60
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a2f38bee24f0e7f66aee4b563903bbf877c85b01;p=libucw.git

Config: CONFIG_DIRECT_IO moved to UCW namespace
---

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 778cbaab..46c6fa40 100644
--- 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 e8d035b2..f9d2b0fa 100644
--- 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 84c20da0..88dbfd52 100644
--- 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 c40b1cac..8653fcdb 100644
--- 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");