From 215c40813a35c4fdc0bb5f1b8fdea125b9e9d2e4 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Thu, 26 Jul 2018 01:50:39 -0400 Subject: a couple more removed files --- lib/measure.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'lib/measure.h') diff --git a/lib/measure.h b/lib/measure.h index 0b86309..8082dd2 100644 --- a/lib/measure.h +++ b/lib/measure.h @@ -1,7 +1,9 @@ #pragma once -#include "measurement.h" +#include "state.h" +#include "correlation.h" +#include #define POSSIBLE_MEASUREMENTS 4 const unsigned char measurement_energy = 1 << 0; @@ -11,14 +13,6 @@ const unsigned char measurement_fourierZero = 1 << 3; char const *measurement_labels[] = {"E", "S", "M", "F"}; -#ifdef __cplusplus - -#include "state.h" -#include "correlation.h" -#include - - - FILE **measure_setup_files(unsigned char flags, unsigned long timestamp) { FILE **files = (FILE **)calloc(POSSIBLE_MEASUREMENTS, sizeof(FILE *)); @@ -66,6 +60,4 @@ void measure_free_files(unsigned char flags, FILE **files) { free(files); } -#endif - -- cgit v1.2.3-70-g09d2