Sanitize #include statements

The general rule I'm aiming for is to <> include
system wide / installed paths / generally everything
that's outside the git managed source tree (this means
mruby paths too!), and "" include everything else,
ie. local mkxp headers.

The only current exception are the mri headers, which
all have './' at their front as to not clash with
system wide ruby headers. I'm leaving them be for now
until I can come up with a better general solution.
This commit is contained in:
Jonas Kulla 2013-12-04 17:48:37 +01:00
parent 9a63140f3e
commit ef2430e0c3
45 changed files with 104 additions and 108 deletions

View file

@ -21,23 +21,23 @@
#include "binding.h"
#include "mruby.h"
#include "mruby/string.h"
#include "mruby/array.h"
#include "mruby/class.h"
#include "mruby/irep.h"
#include "mruby/compile.h"
#include "mruby/proc.h"
#include "mruby/dump.h"
#include <mruby.h>
#include <mruby/string.h>
#include <mruby/array.h>
#include <mruby/class.h>
#include <mruby/irep.h>
#include <mruby/compile.h>
#include <mruby/proc.h>
#include <mruby/dump.h>
#include "binding-util.h"
#include "stdio.h"
#include "zlib.h"
#include <stdio.h>
#include <zlib.h>
#include "SDL_messagebox.h"
#include "SDL_rwops.h"
#include "SDL_timer.h"
#include <SDL_messagebox.h>
#include <SDL_rwops.h>
#include <SDL_timer.h>
#include "sharedstate.h"
#include "texpool.h"

View file

@ -22,10 +22,10 @@
#ifndef BINDINGUTIL_H
#define BINDINGUTIL_H
#include "mruby.h"
#include "mruby/data.h"
#include "mruby/variable.h"
#include "mruby/class.h"
#include <mruby.h>
#include <mruby/data.h>
#include <mruby/variable.h>
#include <mruby/class.h>
#include <stdio.h>

View file

@ -23,7 +23,6 @@
#include "binding-util.h"
#include "binding-types.h"
#include "serializable-binding.h"
#include "mruby/class.h"
#include <QDebug>

View file

@ -24,7 +24,7 @@
#include "binding-types.h"
#include "exception.h"
#include "mruby/string.h"
#include <mruby/string.h>
DEF_TYPE(Font);

View file

@ -21,7 +21,6 @@
#include "graphics.h"
#include "sharedstate.h"
#include "mruby.h"
#include "binding-util.h"
#include "exception.h"

View file

@ -22,11 +22,11 @@
#include "file.h"
#include "../binding-util.h"
#include "mruby/string.h"
#include "mruby/array.h"
#include "mruby/class.h"
#include <mruby/string.h>
#include <mruby/array.h>
#include <mruby/class.h>
#include "SDL_rwops.h"
#include <SDL_rwops.h>
#include <stdio.h>
#include <errno.h>

View file

@ -24,7 +24,7 @@
#include "../binding-util.h"
#include "SDL_rwops.h"
#include <SDL_rwops.h>
struct FileImpl
{

View file

@ -19,14 +19,14 @@
** along with mkxp. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mruby.h"
#include "mruby/string.h"
#include "mruby/compile.h"
#include <mruby.h>
#include <mruby/string.h>
#include <mruby/compile.h>
#include <stdlib.h>
#include <sys/time.h>
#include "SDL_messagebox.h"
#include <SDL_messagebox.h>
#include "../binding-util.h"
#include "marshal.h"

View file

@ -21,12 +21,12 @@
#include "marshal.h"
#include "mruby/array.h"
#include "mruby/hash.h"
#include "mruby/khash.h"
#include "mruby/string.h"
#include "mruby/variable.h"
#include "mruby/class.h"
#include <mruby/array.h>
#include <mruby/hash.h>
#include <mruby/khash.h>
#include <mruby/string.h>
#include <mruby/variable.h>
#include <mruby/class.h>
#include <stdio.h>
#include <string.h>
@ -38,7 +38,7 @@
#include "rwmem.h"
#include "exception.h"
#include "SDL_timer.h"
#include <SDL_timer.h>
#include <QVector>
#include <QHash>

View file

@ -22,8 +22,8 @@
#ifndef MARSHAL_H
#define MARSHAL_H
#include "mruby.h"
#include "SDL_rwops.h"
#include <mruby.h>
#include <SDL_rwops.h>
void marshalDumpInt(mrb_state *, SDL_RWops *, mrb_value);
mrb_value marshalLoadInt(mrb_state *, SDL_RWops *);

View file

@ -21,7 +21,7 @@
#include "rwmem.h"
#include "SDL_rwops.h"
#include <SDL_rwops.h>
#include <QVector>
typedef QVector<char> ByteVec;

View file

@ -20,9 +20,10 @@
*/
#include "../binding-util.h"
#include "mruby/string.h"
#include "mruby/array.h"
#include "mruby/class.h"
#include <mruby/string.h>
#include <mruby/array.h>
#include <mruby/class.h>
#include "time.h"
#include <sys/time.h>

View file

@ -25,7 +25,7 @@
#include "serializable.h"
#include "binding-util.h"
#include "mruby/string.h"
#include <mruby/string.h>
template<class C>
MRB_METHOD(serializableDump)

View file

@ -24,8 +24,6 @@
#include "binding-types.h"
#include "serializable-binding.h"
#include "mruby.h"
#include <QDebug>
DEF_TYPE(Table);

View file

@ -28,7 +28,7 @@
#include "binding-util.h"
#include "binding-types.h"
#include "mruby/array.h"
#include <mruby/array.h>
static const mrb_data_type TilemapAutotilesType =
{