From 7d3a20f3d5209297575189839c7bf1ac64ceb96a Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 23 Apr 2021 18:05:22 +0200
Subject: Fix build without MsgPack

---
 libcrystfel/src/image-msgpack.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'libcrystfel/src')

diff --git a/libcrystfel/src/image-msgpack.c b/libcrystfel/src/image-msgpack.c
index 19b0b120..2f7b4575 100644
--- a/libcrystfel/src/image-msgpack.c
+++ b/libcrystfel/src/image-msgpack.c
@@ -37,18 +37,17 @@
 #include <stdint.h>
 #include <assert.h>
 #include <unistd.h>
-#include <zmq.h>
-#include <msgpack.h>
 
 #include <image.h>
 #include <utils.h>
-#include <msgpack.h>
 
 #include "datatemplate_priv.h"
 
 
 #if defined(HAVE_MSGPACK)
 
+#include <msgpack.h>
+
 static msgpack_object *find_main_object(msgpack_unpacked *unpacked)
 {
 	int n_obj;
@@ -448,28 +447,28 @@ int image_msgpack_read(struct image *image,
 
 #else /* defined(HAVE_MSGPACK) */
 
-static UNUSED int image_msgpack_read(struct image *image,
-                                     const DataTemplate *dtempl,
-                                     void *data,
-                                     size_t data_size)
+int image_msgpack_read(struct image *image,
+                       const DataTemplate *dtempl,
+                       void *data,
+                       size_t data_size)
 {
 	ERROR("MessagePack is not supported in this installation (read).\n");
 	return 1;
 }
 
-static UNUSED ImageFeatureList *image_msgpack_read_peaks(const DataTemplate *dtempl,
-                                                         void *data_block,
-                                                         size_t data_block_size,
-                                                         int half_pixel_shift)
+ImageFeatureList *image_msgpack_read_peaks(const DataTemplate *dtempl,
+                                           void *data_block,
+                                           size_t data_block_size,
+                                           int half_pixel_shift)
 {
 	ERROR("MessagePack is not supported in this installation (read_peaks).\n");
 	return NULL;
 }
 
-static UNUSED double image_msgpack_get_value(const char *name,
-                                             void *data_block,
-                                             size_t data_block_size,
-                                             char *ptype)
+double image_msgpack_get_value(const char *name,
+                               void *data_block,
+                               size_t data_block_size,
+                               char *ptype)
 {
 	ERROR("MessagePack is not supported in this installation (get_value).\n");
 	*ptype = 'f';
-- 
cgit v1.2.3