From 03f7b5a6b692fb1bfec49e8cd5d5f823da12f426 Mon Sep 17 00:00:00 2001
From: Moazin Khatti <moazinkhatri@gmail.com>
Date: Fri, 23 Aug 2019 14:54:02 +0500
Subject: [ot-svg] Renames `svgtypes.c' to `svgtypes.h'.

Also adds an `ifndef' check to prevent loading multiple times.
---
 src/svg/rules.mk   |  6 +++---
 src/svg/svg.c      |  2 +-
 src/svg/svgtypes.c | 32 --------------------------------
 src/svg/svgtypes.h | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 36 deletions(-)
 delete mode 100644 src/svg/svgtypes.c
 create mode 100644 src/svg/svgtypes.h

(limited to 'src')

diff --git a/src/svg/rules.mk b/src/svg/rules.mk
index 3fa41606d..869d50087 100644
--- a/src/svg/rules.mk
+++ b/src/svg/rules.mk
@@ -31,13 +31,13 @@ SVG_PORT_COMPILE := $(CC) $I$(subst /,$(COMPILER_SEP),$(SVG_DIR)) \
 
 # svg renderer sources (i.e., C files)
 #
-SVG_DRV_SRC := $(SVG_DIR)/ftsvg.c \
-	             $(SVG_DIR)/svgtypes.c
+SVG_DRV_SRC := $(SVG_DIR)/ftsvg.c
 
 
 # svg renderer headers
 #
-SVG_DRV_H := $(SVG_DIR)/ftsvg.h
+SVG_DRV_H := $(SVG_DIR)/ftsvg.h \
+	           $(SVG_DIR)/svgtypes.h
 
 
 # svg renderer object(s)
diff --git a/src/svg/svg.c b/src/svg/svg.c
index baa720ce9..6dbeae442 100644
--- a/src/svg/svg.c
+++ b/src/svg/svg.c
@@ -18,7 +18,7 @@
 #define FT_MAKE_OPTION_SINGLE_OBJECT
 #include <ft2build.h>
 
-#include "svgtypes.c"
+#include "svgtypes.h"
 #include "ftsvg.c"
 
 
diff --git a/src/svg/svgtypes.c b/src/svg/svgtypes.c
deleted file mode 100644
index 19514347e..000000000
--- a/src/svg/svgtypes.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************************
- *
- * svgtypes.h
- *
- *   The FreeType svg renderer internal types (specification).
- *
- * Copyright (C) 1996-2019 by
- * David Turner, Robert Wilhelm, Werner Lemberg and Moazin Khatti.
- *
- * This file is part of the FreeType project, and may only be used,
- * modified, and distributed under the terms of the FreeType project
- * license, LICENSE.TXT.  By continuing to use, modify, or distribute
- * this file you indicate that you have read the license and
- * understand and accept it fully.
- *
- */
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_RENDER_H
-#include FT_OTSVG_H
-
-  typedef struct SVG_RendererRec_
-  {
-    FT_RendererRec     root;   /* This inherits FT_RendererRec */
-    FT_Bool            loaded;
-    FT_Bool            hooks_set;
-    SVG_RendererHooks  hooks;  /* Holds out hooks to the outside library */
-  } SVG_RendererRec;
-
-  typedef struct SVG_RendererRec_*  SVG_Renderer;
-
diff --git a/src/svg/svgtypes.h b/src/svg/svgtypes.h
new file mode 100644
index 000000000..cc34942e9
--- /dev/null
+++ b/src/svg/svgtypes.h
@@ -0,0 +1,36 @@
+/****************************************************************************
+ *
+ * svgtypes.h
+ *
+ *   The FreeType svg renderer internal types (specification).
+ *
+ * Copyright (C) 1996-2019 by
+ * David Turner, Robert Wilhelm, Werner Lemberg and Moazin Khatti.
+ *
+ * This file is part of the FreeType project, and may only be used,
+ * modified, and distributed under the terms of the FreeType project
+ * license, LICENSE.TXT.  By continuing to use, modify, or distribute
+ * this file you indicate that you have read the license and
+ * understand and accept it fully.
+ *
+ */
+
+#ifndef FTSVGTYPES_H
+#define FTSVGTYPES_H
+
+#include <ft2build.h>
+#include FT_INTERNAL_OBJECTS_H
+#include FT_RENDER_H
+#include FT_OTSVG_H
+
+  typedef struct SVG_RendererRec_
+  {
+    FT_RendererRec     root;   /* This inherits FT_RendererRec */
+    FT_Bool            loaded;
+    FT_Bool            hooks_set;
+    SVG_RendererHooks  hooks;  /* Holds out hooks to the outside library */
+  } SVG_RendererRec;
+
+  typedef struct SVG_RendererRec_*  SVG_Renderer;
+
+#endif
-- 
cgit v1.2.1