aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <burg@ese.eur.nl>2016-09-20 17:07:25 +0200
committerGertjan van den Burg <burg@ese.eur.nl>2016-09-20 17:07:25 +0200
commite8810fbc6194b56afbf9bac631b6e78ae3b92fb5 (patch)
tree42df5094d677d05cb18f2fb28a83a81907e97bf2
parentIgnore coverage dir (diff)
downloadgensvm-e8810fbc6194b56afbf9bac631b6e78ae3b92fb5.tar.gz
gensvm-e8810fbc6194b56afbf9bac631b6e78ae3b92fb5.zip
Change globals.h to gensvm_globals.h
Conformity!
-rw-r--r--include/gensvm_base.h2
-rw-r--r--include/gensvm_cmdarg.h2
-rw-r--r--include/gensvm_globals.h (renamed from include/globals.h)0
-rw-r--r--include/gensvm_grid.h2
-rw-r--r--include/gensvm_print.h2
-rw-r--r--include/gensvm_simplex.h2
-rw-r--r--include/gensvm_strutil.h2
-rw-r--r--include/gensvm_timer.h2
-rw-r--r--src/gensvm_memory.c2
9 files changed, 8 insertions, 8 deletions
diff --git a/include/gensvm_base.h b/include/gensvm_base.h
index f2df59f..0366edf 100644
--- a/include/gensvm_base.h
+++ b/include/gensvm_base.h
@@ -14,7 +14,7 @@
#define GENSVM_BASE_H
// includes
-#include "globals.h"
+#include "gensvm_globals.h"
// type declarations
diff --git a/include/gensvm_cmdarg.h b/include/gensvm_cmdarg.h
index ac33be8..600de81 100644
--- a/include/gensvm_cmdarg.h
+++ b/include/gensvm_cmdarg.h
@@ -12,7 +12,7 @@
#ifndef GENSVM_CMDARG_H
#define GENSVM_CMDARG_H
-#include "globals.h"
+#include "gensvm_globals.h"
// function declarations
int gensvm_check_argv(int argc, char **argv, char *str);
diff --git a/include/globals.h b/include/gensvm_globals.h
index 96d3b38..96d3b38 100644
--- a/include/globals.h
+++ b/include/gensvm_globals.h
diff --git a/include/gensvm_grid.h b/include/gensvm_grid.h
index d335d7c..a37ce12 100644
--- a/include/gensvm_grid.h
+++ b/include/gensvm_grid.h
@@ -15,7 +15,7 @@
#ifndef GENSVM_GRID_H
#define GENSVM_GRID_H
-#include "globals.h"
+#include "gensvm_globals.h"
/**
* @brief Structure for describing the entire grid search
diff --git a/include/gensvm_print.h b/include/gensvm_print.h
index fff7af5..4cd1dd9 100644
--- a/include/gensvm_print.h
+++ b/include/gensvm_print.h
@@ -13,7 +13,7 @@
#define GENSVM_PRINT_H
// includes
-#include "globals.h"
+#include "gensvm_globals.h"
// function declarations
void note(const char *fmt,...);
diff --git a/include/gensvm_simplex.h b/include/gensvm_simplex.h
index 9bb40b1..d774afa 100644
--- a/include/gensvm_simplex.h
+++ b/include/gensvm_simplex.h
@@ -10,7 +10,7 @@
#define GENSVM_SIMPLEX_H
// includes
-#include "globals.h"
+#include "gensvm_globals.h"
// forward declarations
void gensvm_simplex(long K, double *U);
diff --git a/include/gensvm_strutil.h b/include/gensvm_strutil.h
index acdd0c0..d70809b 100644
--- a/include/gensvm_strutil.h
+++ b/include/gensvm_strutil.h
@@ -13,7 +13,7 @@
#ifndef GENSVM_STRUTIL_H
#define GENSVM_STRUTIL_H
-#include "globals.h"
+#include "gensvm_globals.h"
bool str_startswith(const char *str, const char *pre);
bool str_endswith(const char *str, const char *suf);
diff --git a/include/gensvm_timer.h b/include/gensvm_timer.h
index 11e61e5..563576b 100644
--- a/include/gensvm_timer.h
+++ b/include/gensvm_timer.h
@@ -13,7 +13,7 @@
#define GENSVM_TIMER_H
// includes
-#include "globals.h"
+#include "gensvm_globals.h"
// function declarations
double gensvm_elapsed_time(clock_t s_time, clock_t e_time);
diff --git a/src/gensvm_memory.c b/src/gensvm_memory.c
index 624a4a6..304e5d8 100644
--- a/src/gensvm_memory.c
+++ b/src/gensvm_memory.c
@@ -6,7 +6,7 @@
*
*/
-#include "globals.h" // imports gensvm_memory.h
+#include "gensvm_globals.h" // imports gensvm_memory.h
/**
* @brief Wrapper for calloc() which warns when allocation fails