From aa14402d9485335904f62970974eaf2afda80769 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Picca=20Fr=C3=83=C2=83=C3=82=C2=A9d=C3=83=C2=83=C3=82=C2=A9?=
 =?utf8?q?ric-Emmanuel?= <picca@debian.org>
Date: Tue, 15 Aug 2017 10:40:21 +0200
Subject: [PATCH] [hkl] remove a bunch of warnings

---
 hkl/hkl-engine-soleil-sixs-med.c |  4 ----
 hkl/hkl-geometry-private.h       | 16 ++++++++--------
 hkl/hkl-geometry.c               |  2 ++
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/hkl/hkl-engine-soleil-sixs-med.c b/hkl/hkl-engine-soleil-sixs-med.c
index 3635f6fb..cbbc1a5d 100644
--- a/hkl/hkl-engine-soleil-sixs-med.c
+++ b/hkl/hkl-engine-soleil-sixs-med.c
@@ -181,10 +181,6 @@ static HklEngine *hkl_engine_soleil_sixs_med_1_2_hkl_new(HklEngineList *engines)
 
 /* mode incidence */
 
-static const HklParameter surface_parameters[] = {
-	SURFACE_PARAMETERS(0, 0, 1),
-};
-
 REGISTER_READONLY_INCIDENCE(hkl_engine_soleil_sixs_med_1_2_incidence_new,
 			    P99_PROTECT({PITCH, MU}),
 			    surface_parameters_z);
diff --git a/hkl/hkl-geometry-private.h b/hkl/hkl-geometry-private.h
index adec8211..66701b37 100644
--- a/hkl/hkl-geometry-private.h
+++ b/hkl/hkl-geometry-private.h
@@ -78,19 +78,19 @@ struct _HklGeometry
 	const HklGeometryOperations *ops;
 };
 
-static HklHolder *hkl_geometry_sample_holder_get_real(const HklGeometry *self,
-						      UNUSED const HklSample *sample)
+static inline HklHolder *hkl_geometry_sample_holder_get_real(const HklGeometry *self,
+							     UNUSED const HklSample *sample)
 {
 	return darray_item(self->holders, HKL_HOLDER_SAMPLE_IDX);
 }
 
-static HklHolder *hkl_geometry_detector_holder_get_real(const HklGeometry *self,
-							UNUSED const HklDetector *detector)
+static inline HklHolder *hkl_geometry_detector_holder_get_real(const HklGeometry *self,
+							       UNUSED const HklDetector *detector)
 {
 	return darray_item(self->holders, HKL_HOLDER_DETECTOR_IDX);
 }
 
-static HklVector hkl_geometry_ki_get_real(const HklGeometry *self)
+static inline HklVector hkl_geometry_ki_get_real(const HklGeometry *self)
 {
 	HklVector ki;
 
@@ -99,8 +99,8 @@ static HklVector hkl_geometry_ki_get_real(const HklGeometry *self)
 	return ki;
 }
 
-static HklVector hkl_geometry_kf_get_real(const HklGeometry *self,
-					  const HklDetector *detector)
+static inline HklVector hkl_geometry_kf_get_real(const HklGeometry *self,
+						 UNUSED const HklDetector *detector)
 {
 	HklVector kf = {{HKL_TAU / self->source.wave_length, 0, 0}};
 	HklHolder *detector_holder = darray_item(self->holders, HKL_HOLDER_DETECTOR_IDX);
@@ -116,7 +116,7 @@ static HklVector hkl_geometry_kf_get_real(const HklGeometry *self,
 		.ki_get = hkl_geometry_ki_get_real,			\
 		.kf_get = hkl_geometry_kf_get_real
 
-static HklGeometryOperations hkl_geometry_operations_defaults = {HKL_GEOMETRY_OPERATIONS_DEFAULTS};
+extern const HklGeometryOperations hkl_geometry_operations_defaults;
 
 #define HKL_GEOMETRY_ERROR hkl_geometry_error_quark ()
 
diff --git a/hkl/hkl-geometry.c b/hkl/hkl-geometry.c
index 39befae6..00644466 100644
--- a/hkl/hkl-geometry.c
+++ b/hkl/hkl-geometry.c
@@ -260,6 +260,8 @@ HklVector hkl_holder_transformation_apply(const HklHolder *self,
 /* HklGeometry */
 /***************/
 
+const HklGeometryOperations hkl_geometry_operations_defaults = { HKL_GEOMETRY_OPERATIONS_DEFAULTS };
+
 /**
  * hkl_geometry_new: (skip)
  *
-- 
2.11.4.GIT