Skip to content

Commit

Permalink
Change #include <src/foo.h> to #include "foo.h"
Browse files Browse the repository at this point in the history
The main reason we used the former since the HPC-GAP merge was to
allow us to override GAP headers with modified headers for HPC-GAP
during compilation. But now the kernel header files all have been
merged, so this is no longer necessary.

We also change <gen/config.h> back to "config.h", and adjust
the build system suitably.

The following command was used to create the changes in this commit:

sed -i '' -E -e 's;#include <(src|gen)/([^"]+)>;#include "\2";' \
  src/*.* src/hpc/*.* hpcgap/src/*.* tst/test-compile/*.c
  • Loading branch information
fingolfin committed May 15, 2018
1 parent 1ca61a5 commit 78d4b18
Show file tree
Hide file tree
Showing 174 changed files with 1,187 additions and 1,187 deletions.
2 changes: 1 addition & 1 deletion hpcgap/src/c_oper1.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef AVOID_PRECOMPILED
/* C file produced by GAC */
#include <src/compiled.h>
#include "compiled.h"
#define FILE_CRC "-110560148"

/* global variables used in handlers */
Expand Down
2 changes: 1 addition & 1 deletion hpcgap/src/c_type1.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef AVOID_PRECOMPILED
/* C file produced by GAC */
#include <src/compiled.h>
#include "compiled.h"
#define FILE_CRC "-43167549"

/* global variables used in handlers */
Expand Down
10 changes: 5 additions & 5 deletions src/ariths.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
** This file contains the functions of the arithmetic operations package.
*/

#include <src/ariths.h>
#include "ariths.h"

#include <src/bool.h>
#include <src/error.h>
#include <src/modules.h>
#include <src/opers.h>
#include "bool.h"
#include "error.h"
#include "modules.h"
#include "opers.h"


/****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/ariths.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef GAP_ARITHS_H
#define GAP_ARITHS_H

#include <src/objects.h>
#include "objects.h"

/****************************************************************************
**
Expand Down
26 changes: 13 additions & 13 deletions src/blister.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@
*N 1992/12/16 martin should have 'LtBlist'
*/

#include <src/blister.h>

#include <src/ariths.h>
#include <src/bool.h>
#include <src/error.h>
#include <src/gaputils.h>
#include <src/io.h>
#include <src/lists.h>
#include <src/modules.h>
#include <src/plist.h>
#include <src/range.h>
#include <src/saveload.h>
#include <src/set.h>
#include "blister.h"

#include "ariths.h"
#include "bool.h"
#include "error.h"
#include "gaputils.h"
#include "io.h"
#include "lists.h"
#include "modules.h"
#include "plist.h"
#include "range.h"
#include "saveload.h"
#include "set.h"


/****************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions src/blister.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef GAP_BLISTER_H
#define GAP_BLISTER_H

#include <src/bool.h>
#include <src/objects.h>
#include "bool.h"
#include "objects.h"

/****************************************************************************
**
Expand Down
20 changes: 10 additions & 10 deletions src/boehm_gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
** where the non-boehm versions of these methods live.
**/

#include <src/system.h>
#include <src/gapstate.h>
#include <src/gasman.h>
#include <src/objects.h>
#include <src/sysmem.h>
#include "system.h"
#include "gapstate.h"
#include "gasman.h"
#include "objects.h"
#include "sysmem.h"

#include <src/hpc/misc.h>
#include <src/hpc/thread.h>
#include <src/hpc/guards.h>
#include "hpc/misc.h"
#include "hpc/thread.h"
#include "hpc/guards.h"

#ifdef TRACK_CREATOR
#include <src/calls.h>
#include <src/vars.h>
#include "calls.h"
#include "vars.h"
#endif

#ifndef USE_BOEHM_GC
Expand Down
16 changes: 8 additions & 8 deletions src/bool.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
** True and Fail.
*/

#include <src/bool.h>

#include <src/ariths.h>
#include <src/calls.h>
#include <src/gvars.h>
#include <src/io.h>
#include <src/modules.h>
#include <src/opers.h>
#include "bool.h"

#include "ariths.h"
#include "calls.h"
#include "gvars.h"
#include "io.h"
#include "modules.h"
#include "opers.h"


/****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/bool.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#ifndef GAP_BOOL_H
#define GAP_BOOL_H

#include <src/objects.h>
#include "objects.h"

/****************************************************************************
**
Expand Down
2 changes: 1 addition & 1 deletion src/c_oper1.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef AVOID_PRECOMPILED
/* C file produced by GAC */
#include <src/compiled.h>
#include "compiled.h"
#define FILE_CRC "-110560148"

/* global variables used in handlers */
Expand Down
2 changes: 1 addition & 1 deletion src/c_type1.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef AVOID_PRECOMPILED
/* C file produced by GAC */
#include <src/compiled.h>
#include "compiled.h"
#define FILE_CRC "-43167549"

/* global variables used in handlers */
Expand Down
32 changes: 16 additions & 16 deletions src/calls.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@
** ...what the other components are...
*/

#include <src/calls.h>

#include <src/bool.h>
#include <src/code.h>
#include <src/error.h>
#include <src/gvars.h>
#include <src/integer.h>
#include <src/io.h>
#include <src/lists.h>
#include <src/modules.h>
#include <src/opers.h>
#include <src/plist.h>
#include <src/saveload.h>
#include <src/stats.h>
#include <src/stringobj.h>
#include <src/vars.h>
#include "calls.h"

#include "bool.h"
#include "code.h"
#include "error.h"
#include "gvars.h"
#include "integer.h"
#include "io.h"
#include "lists.h"
#include "modules.h"
#include "opers.h"
#include "plist.h"
#include "saveload.h"
#include "stats.h"
#include "stringobj.h"
#include "vars.h"


void SET_NAME_FUNC(Obj func, Obj name)
Expand Down
4 changes: 2 additions & 2 deletions src/calls.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
#ifndef GAP_CALLS_H
#define GAP_CALLS_H

#include <src/gaputils.h>
#include <src/objects.h>
#include "gaputils.h"
#include "objects.h"


typedef Obj (* ObjFunc_0ARGS) (Obj self);
Expand Down
40 changes: 20 additions & 20 deletions src/code.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@
** expressions. Its functions are called from the reader.
*/

#include <src/code.h>

#include <src/bool.h>
#include <src/calls.h>
#include <src/funcs.h>
#include <src/gapstate.h>
#include <src/gvars.h>
#include <src/hookintrprtr.h>
#include <src/io.h>
#include <src/lists.h>
#include <src/modules.h>
#include <src/plist.h>
#include <src/read.h>
#include <src/records.h>
#include <src/saveload.h>
#include <src/stringobj.h>
#include <src/vars.h>

#include <src/hpc/thread.h>
#include "code.h"

#include "bool.h"
#include "calls.h"
#include "funcs.h"
#include "gapstate.h"
#include "gvars.h"
#include "hookintrprtr.h"
#include "io.h"
#include "lists.h"
#include "modules.h"
#include "plist.h"
#include "read.h"
#include "records.h"
#include "saveload.h"
#include "stringobj.h"
#include "vars.h"

#include "hpc/thread.h"

#ifdef HPCGAP
#include <src/hpc/aobjects.h>
#include "hpc/aobjects.h"
#endif


Expand Down
4 changes: 2 additions & 2 deletions src/code.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#ifndef GAP_CODE_H
#define GAP_CODE_H

#include <src/debug.h>
#include <src/objects.h>
#include "debug.h"
#include "objects.h"

/****************************************************************************
**
Expand Down
114 changes: 57 additions & 57 deletions src/compiled.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,65 +14,65 @@ extern "C" {
#define GAP_IN_EXTERN_C
#endif

#include <src/ariths.h>
#include <src/blister.h>
#include <src/bool.h>
#include <src/calls.h>
#include <src/code.h>
#include <src/compiler.h>
#include <src/compstat.h>
#include <src/costab.h>
#include <src/cyclotom.h>
#include <src/dt.h>
#include <src/dteval.h>
#include <src/error.h>
#include <src/exprs.h>
#include <src/finfield.h>
#include <src/funcs.h>
#include <src/gap.h>
#include <src/gapstate.h>
#include <src/gasman.h>
#include <src/gvars.h>
#include <src/integer.h>
#include <src/intrprtr.h>
#include <src/io.h>
#include <src/iostream.h>
#include <src/listfunc.h>
#include <src/listoper.h>
#include <src/lists.h>
#include <src/macfloat.h>
#include <src/modules.h>
#include <src/objcftl.h>
#include <src/objects.h>
#include <src/objfgelm.h>
#include <src/objpcgel.h>
#include <src/objscoll.h>
#include <src/opers.h>
#include <src/permutat.h>
#include <src/plist.h>
#include <src/pperm.h>
#include <src/precord.h>
#include <src/range.h>
#include <src/rational.h>
#include <src/read.h>
#include <src/records.h>
#include <src/saveload.h>
#include <src/scanner.h>
#include <src/sctable.h>
#include <src/set.h>
#include <src/stats.h>
#include <src/streams.h>
#include <src/stringobj.h>
#include <src/sysfiles.h>
#include <src/system.h>
#include <src/tietze.h>
#include <src/trans.h>
#include <src/vars.h>
#include <src/vector.h>
#include <src/weakptr.h>
#include "ariths.h"
#include "blister.h"
#include "bool.h"
#include "calls.h"
#include "code.h"
#include "compiler.h"
#include "compstat.h"
#include "costab.h"
#include "cyclotom.h"
#include "dt.h"
#include "dteval.h"
#include "error.h"
#include "exprs.h"
#include "finfield.h"
#include "funcs.h"
#include "gap.h"
#include "gapstate.h"
#include "gasman.h"
#include "gvars.h"
#include "integer.h"
#include "intrprtr.h"
#include "io.h"
#include "iostream.h"
#include "listfunc.h"
#include "listoper.h"
#include "lists.h"
#include "macfloat.h"
#include "modules.h"
#include "objcftl.h"
#include "objects.h"
#include "objfgelm.h"
#include "objpcgel.h"
#include "objscoll.h"
#include "opers.h"
#include "permutat.h"
#include "plist.h"
#include "pperm.h"
#include "precord.h"
#include "range.h"
#include "rational.h"
#include "read.h"
#include "records.h"
#include "saveload.h"
#include "scanner.h"
#include "sctable.h"
#include "set.h"
#include "stats.h"
#include "streams.h"
#include "stringobj.h"
#include "sysfiles.h"
#include "system.h"
#include "tietze.h"
#include "trans.h"
#include "vars.h"
#include "vector.h"
#include "weakptr.h"

#ifdef HPCGAP
#include <src/hpc/aobjects.h>
#include "hpc/aobjects.h"
#endif

extern Obj InfoDecision;
Expand Down
Loading

0 comments on commit 78d4b18

Please sign in to comment.