Fix build without c-pages, but with c-fsindex

chpock · May 26, 2024 · a497800 · a497800
1 parent 921c8d8
commit a497800
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -18,13 +18,16 @@ jobs:
             configure: "--disable-c-pkgconfig --disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
             description: "no pkgcfg, pages, fsindex, readedchannel, writer, writerchannel, vfs"
           - compiler: gcc
-            configure: "--disable-c-pages --disable-c-fsindex --disable-c-readerchannel  --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
+            configure: "--disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
             description: "no pages, fsindex, readedchannel, writer, writerchannel, vfs"
           - compiler: gcc
-            configure: "--disable-c-fsindex --disable-c-readerchannel  --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
+            configure: "--disable-c-pages --disable-c-readerchannel --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
             description: "no fsindex, readedchannel, writer, writerchannel, vfs"
           - compiler: gcc
-            configure: "--disable-c-readerchannel  --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
+            configure: "--disable-c-fsindex --disable-c-readerchannel --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
+            description: "no fsindex, readedchannel, writer, writerchannel, vfs"
+          - compiler: gcc
+            configure: "--disable-c-readerchannel --disable-c-writer --disable-c-writerchannel --disable-c-vfs"
             description: "no readedchannel, writer, writerchannel, vfs"
           - compiler: gcc
             configure: " --disable-c-writer --disable-c-writerchannel --disable-c-vfs"

diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 2024-05-26 Konstantin Kushnir <[email protected]>
 	* Add tests for writer
+	* Fix build without c-pages, but with c-fsindex
 
 2024-05-25 Konstantin Kushnir <[email protected]>
 	* Add support for writer in C

diff --git a/generic/fsindexIO.c b/generic/fsindexIO.c
@@ -76,6 +76,8 @@ Tcl_Obj *Cookfs_FsindexToObject(Cookfs_Fsindex *fsIndex) {
     return result;
 }
 
+#ifdef COOKFS_USECPAGES
+
 /*
  *----------------------------------------------------------------------
  *
@@ -127,6 +129,8 @@ Cookfs_Fsindex *Cookfs_FsindexFromPages(Cookfs_Fsindex *fsindex, Cookfs_Pages *p
     return rc;
 }
 
+#endif /* COOKFS_USECPAGES */
+
 /*
  *----------------------------------------------------------------------
  *

diff --git a/generic/fsindexIO.h b/generic/fsindexIO.h
@@ -8,7 +8,9 @@
 
 Tcl_Obj *Cookfs_FsindexToObject(Cookfs_Fsindex *i);
 Cookfs_Fsindex *Cookfs_FsindexFromObject(Cookfs_Fsindex *i, Tcl_Obj *o);
+#ifdef COOKFS_USECPAGES
 Cookfs_Fsindex *Cookfs_FsindexFromPages(Cookfs_Fsindex *fsindex, Cookfs_Pages *pages);
+#endif /* COOKFS_USECPAGES */
 
 #endif /* COOKFS_USECFSINDEX */