Skip to content
Snippets Groups Projects
Commit c661e4bb authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'proper-config-include' into 'master'

Use the standard method to locate the config.h file.

See merge request !1605
parents 1bce4e42 d693be78
No related branches found
No related tags found
12 merge requests!1715Update planetary strength after planetary plus's master rebase,!1693More threapool plotting tweaks,!1668before Mag.Egy in all the flavors,!1663Initial sync to work again,!1662Initial sync from previous months,!1642When searching for more particles in a ghost task we walk up the cell tree,...,!1633When searching for more particles in a ghost task we walk up the cell tree,...,!1631Solving issues with different Hydro Schemes,!1620Mhd canvas,!1619Mhd canvas,!1617Update to from main branch to Canvas to MHD_FS,!1605Use the standard method to locate the config.h file.
Showing
with 20 additions and 20 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
#include "argparse.h" #include "argparse.h"
#include "config.h" #include <config.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
......
...@@ -482,7 +482,7 @@ Then we also need a ``runner_doiact_my_suff.c`` file where the functions declare ...@@ -482,7 +482,7 @@ Then we also need a ``runner_doiact_my_suff.c`` file where the functions declare
``runner_doiact_my_suff.h`` are defined by including them with ``FUNCTION`` defined:: ``runner_doiact_my_suff.h`` are defined by including them with ``FUNCTION`` defined::
#include "../config.h" #include <config.h>
/* other includes too... */ /* other includes too... */
/* Import the new interaction loop functions. */ /* Import the new interaction loop functions. */
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
******************************************************************************/ ******************************************************************************/
#include "config.h" #include <config.h>
/* Some standard headers. */ /* Some standard headers. */
#include <fenv.h> #include <fenv.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_ACCUMULATE_H #define SWIFT_ACCUMULATE_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Local includes */ /* Local includes */
#include "atomic.h" #include "atomic.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_ACTIVE_H #define SWIFT_ACTIVE_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Local includes. */ /* Local includes. */
#include "cell.h" #include "cell.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
*/ */
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Some standard headers. */ /* Some standard headers. */
#include <math.h> #include <math.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_ATOMIC_H #define SWIFT_ATOMIC_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Includes. */ /* Includes. */
#include "inline.h" #include "inline.h"
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
*/ */
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Standard headers */ /* Standard headers */
#include <pthread.h> #include <pthread.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_BINOMIAL_H #define SWIFT_BINOMIAL_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Local headers */ /* Local headers */
#include "error.h" #include "error.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_BLACK_HOLES_H #define SWIFT_BLACK_HOLES_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Select the correct BH model */ /* Select the correct BH model */
#if defined(BLACK_HOLES_NONE) #if defined(BLACK_HOLES_NONE)
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_EAGLE_BLACK_HOLES_PARAMETERS_H #define SWIFT_EAGLE_BLACK_HOLES_PARAMETERS_H
/* Configuration file */ /* Configuration file */
#include "config.h" #include <config.h>
/** /**
* @file EAGLE/black_holes_parameters.h * @file EAGLE/black_holes_parameters.h
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_EAGLE_BLACK_HOLES_PROPERTIES_H #define SWIFT_EAGLE_BLACK_HOLES_PROPERTIES_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Local includes. */ /* Local includes. */
#include "chemistry.h" #include "chemistry.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_SPIN_JET_BLACK_HOLES_PARAMETERS_H #define SWIFT_SPIN_JET_BLACK_HOLES_PARAMETERS_H
/* Configuration file */ /* Configuration file */
#include "config.h" #include <config.h>
/** /**
* @file EAGLE/black_holes_parameters.h * @file EAGLE/black_holes_parameters.h
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_BLACK_HOLES_DEBUG_H #define SWIFT_BLACK_HOLES_DEBUG_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Import the debug routines of the right black holes definition */ /* Import the debug routines of the right black holes definition */
#if defined(BLACK_HOLES_NONE) #if defined(BLACK_HOLES_NONE)
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef SWIFT_BLACK_HOLES_IO_H #ifndef SWIFT_BLACK_HOLES_IO_H
#define SWIFT_BLACK_HOLES_IO_H #define SWIFT_BLACK_HOLES_IO_H
#include "../config.h" #include <config.h>
/* Local includes */ /* Local includes */
#include "engine.h" #include "engine.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_BLACK_HOLES_PROPERTIES_H #define SWIFT_BLACK_HOLES_PROPERTIES_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Select the correct black_holes model */ /* Select the correct black_holes model */
#if defined(BLACK_HOLES_NONE) #if defined(BLACK_HOLES_NONE)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
*/ */
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
#include "inline.h" #include "inline.h"
/* Import the right black holes definition */ /* Import the right black holes definition */
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define SWIFT_CACHE_H #define SWIFT_CACHE_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Local headers */ /* Local headers */
#include "align.h" #include "align.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define SWIFT_CBRT_H #define SWIFT_CBRT_H
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Some standard headers. */ /* Some standard headers. */
#include <math.h> #include <math.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
******************************************************************************/ ******************************************************************************/
/* Config parameters. */ /* Config parameters. */
#include "../config.h" #include <config.h>
/* Some standard headers. */ /* Some standard headers. */
#include <float.h> #include <float.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment