summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-08-17 21:31:56 -0300
committerWerner Almesberger <werner@almesberger.net>2016-08-17 21:31:56 -0300
commitaa48221d9d5cb91ea4bb2eafbf0189e459996a5a (patch)
treeb7b21746ae4f4e4d2bba77138b54670cbd931894
parent65ba1f11f0ca4bc191df128a28af5c12a330c110 (diff)
downloadeeshow-aa48221d9d5cb91ea4bb2eafbf0189e459996a5a.tar.gz
eeshow-aa48221d9d5cb91ea4bb2eafbf0189e459996a5a.tar.bz2
eeshow-aa48221d9d5cb91ea4bb2eafbf0189e459996a5a.zip
eeshow/misc.c: goes to gfx/, too
-rw-r--r--Makefile4
-rw-r--r--gfx/misc.c (renamed from misc.c)4
-rw-r--r--gfx/misc.h (renamed from misc.h)8
-rw-r--r--gfx/text.c2
-rw-r--r--kicad/dwg.c2
-rw-r--r--kicad/lib-render.c2
-rw-r--r--kicad/sch-render.c2
7 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 96791ee..2993ac4 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ OBJS = main.o \
file/file.o file/git-util.o file/git-file.o file/git-hist.o \
delta.o \
gfx/style.o gfx/fig.o gfx/record.o gfx/cro.o gfx/diff.o gfx/gfx.o \
- gfx/text.o \
- misc.o diag.o
+ gfx/text.o gfx/misc.o \
+ diag.o
CFLAGS = -g -Wall -Wextra -Wno-unused-parameter -Wshadow \
-Wmissing-prototypes -Wmissing-declarations \
diff --git a/misc.c b/gfx/misc.c
index 687ce01..06f87e6 100644
--- a/misc.c
+++ b/gfx/misc.c
@@ -1,5 +1,5 @@
/*
- * misc.c - Helper functions for geometry and attributes
+ * gfx/misc.c - Helper functions for geometry and attributes
*
* Written 2016 by Werner Almesberger
* Copyright 2016 Werner Almesberger
@@ -17,7 +17,7 @@
#include <assert.h>
#include "diag.h"
-#include "misc.h"
+#include "gfx/misc.h"
static bool eq(const int m[6], int xx, int xy, int yx, int yy)
diff --git a/misc.h b/gfx/misc.h
index 40c15f0..28ef2fe 100644
--- a/misc.h
+++ b/gfx/misc.h
@@ -1,5 +1,5 @@
/*
- * misc.h - Helper functions for geometry and attributes
+ * gfx/misc.h - Helper functions for geometry and attributes
*
* Written 2016 by Werner Almesberger
* Copyright 2016 Werner Almesberger
@@ -11,8 +11,8 @@
*/
-#ifndef MISC_H
-#define MISC_H
+#ifndef GFX_MISC_H
+#define GFX_MISC_H
#include <stdbool.h>
@@ -48,4 +48,4 @@ int angle_add(int a, int b);
int rx(int x, int y, int rot);
int ry(int x, int y, int rot);
-#endif /* !MISC_H */
+#endif /* !GFX_MISC_H */
diff --git a/gfx/text.c b/gfx/text.c
index bc9625d..58c8c5a 100644
--- a/gfx/text.c
+++ b/gfx/text.c
@@ -17,7 +17,7 @@
#include <string.h>
#include "util.h"
-#include "misc.h"
+#include "gfx/misc.h"
#include "gfx/style.h"
#include "gfx/gfx.h"
#include "gfx/text.h"
diff --git a/kicad/dwg.c b/kicad/dwg.c
index d9f4b1a..a2a2be5 100644
--- a/kicad/dwg.c
+++ b/kicad/dwg.c
@@ -18,7 +18,7 @@
#include <assert.h>
#include "util.h"
-#include "misc.h"
+#include "gfx/misc.h"
#include "gfx/style.h"
#include "gfx/text.h"
#include "gfx/gfx.h"
diff --git a/kicad/lib-render.c b/kicad/lib-render.c
index d4e8caf..c4a8477 100644
--- a/kicad/lib-render.c
+++ b/kicad/lib-render.c
@@ -17,7 +17,7 @@
#include "util.h"
#include "diag.h"
-#include "misc.h"
+#include "gfx/misc.h"
#include "gfx/style.h"
#include "gfx/gfx.h"
#include "gfx/text.h"
diff --git a/kicad/sch-render.c b/kicad/sch-render.c
index 9d56d54..0722efa 100644
--- a/kicad/sch-render.c
+++ b/kicad/sch-render.c
@@ -15,7 +15,7 @@
#include <stdio.h>
#include <assert.h>
-#include "misc.h"
+#include "gfx/misc.h"
#include "gfx/style.h"
#include "gfx/gfx.h"
#include "kicad/dwg.h"