From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 22 Jun 2016 05:09:58 +0000 (+0200)
Subject: Avoid link error when compiling without libxml2 installed
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0369a800f7007c89a7e12d190fdc81e4f80d4314;p=pspp

Avoid link error when compiling without libxml2 installed
---

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 7033448d8b..ba4218ff77 100644
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -38,6 +38,19 @@ gnumeric_open_reader (const struct spreadsheet_read_options *opts, struct dictio
   return NULL;
 }
 
+struct casereader *
+gnumeric_make_reader (struct spreadsheet *spreadsheet,
+		      const struct spreadsheet_read_options *opts)
+{
+  return NULL;
+}
+
+void
+gnumeric_unref (struct spreadsheet *r)
+{
+}
+
+
 #else
 
 #include "data/gnumeric-reader.h"
diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index 2f058b044d..c2e7a0e354 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -43,6 +43,19 @@ ods_open_reader (const struct spreadsheet_read_options *opts,
   return NULL;
 }
 
+struct casereader *
+ods_make_reader (struct spreadsheet *spreadsheet,
+		 const struct spreadsheet_read_options *opts)
+{
+  return NULL;
+}
+
+
+void
+ods_unref (struct spreadsheet *r)
+{
+}
+
 #else
 
 #include "libpspp/zip-reader.h"
diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index fd1e68de88..13eebe6c3a 100644
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -52,9 +52,6 @@ static const bool odf_read_support = true;
 #else
 static const bool odf_read_support = false;
 struct spreadsheet *ods_probe (const char *filename, bool report_errors){}
-struct casereader * ods_make_reader (struct spreadsheet *spreadsheet,
-					  const struct spreadsheet_read_options *opts){}
-void ods_unref (struct spreadsheet *r){}
 #endif
 
 #ifdef GNM_READ_SUPPORT
@@ -62,10 +59,6 @@ static const bool gnm_read_support = true;
 #else
 static const bool gnm_read_support = false;
 struct spreadsheet *gnumeric_probe (const char *filename, bool report_errors){}
-struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet,
-					  const struct spreadsheet_read_options *opts){}
-void gnumeric_unref (struct spreadsheet *r){}
-
 #endif
 
 static bool parse_spreadsheet (struct lexer *lexer, char **filename,