From: Martin Mares <mj@ucw.cz>
Date: Thu, 30 Oct 2008 23:13:04 +0000 (+0100)
Subject: Fixed more tests which failed with shared libraries.
X-Git-Tag: holmes-import~227^2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=9245f422a8d36a677bf01db2b5f92c46934b5928;p=libucw.git

Fixed more tests which failed with shared libraries.
---

diff --git a/ucw/fb-direct.c b/ucw/fb-direct.c
index 15a4568a..1e2dfd89 100644
--- a/ucw/fb-direct.c
+++ b/ucw/fb-direct.c
@@ -37,15 +37,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-uns fbdir_cheat;
-
-static struct cf_section fbdir_cf = {
-  CF_ITEMS {
-    CF_UNS("Cheat", &fbdir_cheat),
-    CF_END
-  }
-};
-
 #define FBDIR_ALIGN 512
 
 enum fbdir_mode {				// Current operating mode
@@ -68,11 +59,22 @@ struct fb_direct {
 };
 #define FB_DIRECT(f) ((struct fb_direct *)(f)->is_fastbuf)
 
+#ifndef TEST
+uns fbdir_cheat;
+
+static struct cf_section fbdir_cf = {
+  CF_ITEMS {
+    CF_UNS("Cheat", &fbdir_cheat),
+    CF_END
+  }
+};
+
 static void CONSTRUCTOR
 fbdir_global_init(void)
 {
   cf_declare_section("FBDirect", &fbdir_cf, 0);
 }
+#endif
 
 static void
 fbdir_read_sync(struct fb_direct *F)
diff --git a/ucw/fb-mmap.c b/ucw/fb-mmap.c
index 5c6d3142..747b4286 100644
--- a/ucw/fb-mmap.c
+++ b/ucw/fb-mmap.c
@@ -22,6 +22,7 @@
 static uns mmap_window_size = 16*CPU_PAGE_SIZE;
 static uns mmap_extend_size = 4*CPU_PAGE_SIZE;
 
+#ifndef TEST
 static struct cf_section fbmm_config = {
   CF_ITEMS {
     CF_UNS("WindowSize", &mmap_window_size),
@@ -34,6 +35,7 @@ static void CONSTRUCTOR fbmm_init_config(void)
 {
   cf_declare_section("FBMMap", &fbmm_config, 0);
 }
+#endif
 
 struct fb_mmap {
   struct fastbuf fb;
diff --git a/ucw/url.c b/ucw/url.c
index c05bae66..50ed2f7e 100644
--- a/ucw/url.c
+++ b/ucw/url.c
@@ -30,6 +30,7 @@ static uns url_min_repeat_count = 0x7fffffff;
 static uns url_max_repeat_length = 0;
 static uns url_max_occurences = ~0U;
 
+#ifndef TEST
 static struct cf_section url_config = {
   CF_ITEMS {
     CF_UNS("IgnoreSpaces", &url_ignore_spaces),
@@ -46,6 +47,7 @@ static void CONSTRUCTOR url_init_config(void)
 {
   cf_declare_section("URL", &url_config, 0);
 }
+#endif
 
 /* Escaping and de-escaping */