X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Ffb-param.c;h=e0f9a73f49be87ba8d755dac490e6c824cc6b3d0;hb=f17e4350dcf0c033891e52b30b0c32a4a4fed5e0;hp=7543220fa0e89a5853626945415453d0f449f2da;hpb=681b277c0aabea785a21e109dc07338847c0cb32;p=libucw.git

diff --git a/ucw/fb-param.c b/ucw/fb-param.c
index 7543220f..e0f9a73f 100644
--- a/ucw/fb-param.c
+++ b/ucw/fb-param.c
@@ -8,11 +8,11 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/conf.h"
-#include "ucw/lfs.h"
-#include "ucw/fastbuf.h"
-#include "ucw/trans.h"
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/io.h>
+#include <ucw/fastbuf.h>
+#include <ucw/trans.h>
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -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";
@@ -102,7 +102,7 @@ bopen_fd_internal(int fd, struct fb_params *params, uns mode, const char *name)
 	return fb;
       case FB_MMAP:
 	if (!~mode && (int)(mode = fcntl(fd, F_GETFL)) < 0)
-          trans_throw("fb.open", NULL, "Cannot get flags of fd %d: %m", fd);
+          trans_throw("ucw.fb.open", NULL, "Cannot get flags of fd %d: %m", fd);
 	return bfmmopen_internal(fd, name, mode);
       default:
 	ASSERT(0);
@@ -125,7 +125,7 @@ bopen_file_internal(const char *name, int mode, struct fb_params *params, int tr
     if (try)
       return NULL;
     else
-      trans_throw("fb.open", NULL, "Unable to %s file %s: %m", (mode & O_CREAT) ? "create" : "open", name);
+      trans_throw("ucw.fb.open", NULL, "Unable to %s file %s: %m", (mode & O_CREAT) ? "create" : "open", name);
   struct fastbuf *fb = bopen_fd_internal(fd, params, mode, name);
   ASSERT(fb);
   if (mode & O_APPEND)