Merge files

gfx/common/gl3_defines.h

@@ -27,7 +27,6 @@
 #endif
 
 #include <retro_inline.h>
-#include <glsym/glsym.h>
 
 #include "../video_driver.h"
 #include "../drivers_shader/shader_gl3.h"

gfx/common/sixel_defines.h

@@ -1,34 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  copyright (c) 2011-2017 - Daniel De Matteis
- *  copyright (c) 2016-2019 - Brad Parker
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __SIXEL_DEFINES_H
-#define __SIXEL_DEFINES_H
-
-#include <sixel.h>
-
-#define SIXEL_COLORS 256
-
-typedef struct sixel
-{
-   SIXELSTATUS sixel_status;
-   unsigned video_width;
-   unsigned video_height;
-   unsigned screen_width;
-   unsigned screen_height;
-} sixel_t;
-
-#endif

gfx/drivers/sixel_gfx.c

@@ -37,7 +37,6 @@
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../frontend/frontend_driver.h"
-#include "../common/sixel_defines.h"
 
 #ifndef _WIN32
 #define HAVE_SYS_IOCTL_H
@@ -61,9 +60,16 @@
 #error "Old version of libsixel detected, please upgrade to at least 1.6.0."
 #endif
 
-/*
- * FONT DRIVER
- */
+#define SIXEL_COLORS 256
+
+typedef struct sixel
+{
+   SIXELSTATUS sixel_status;
+   unsigned video_width;
+   unsigned video_height;
+   unsigned screen_width;
+   unsigned screen_height;
+} sixel_t;
 
 typedef struct
 {