(Android) Buildfix

src/drivers/libretro/griffin.c

@@ -1,7 +1,7 @@
 #ifdef WANT_GRIFFIN
 
 #include "drivers/libretro/libretro.c"
-#include "drivers/libretro/memstream.c"
+#include "../../memstream.c"
 
 #include "cart.c"
 #include "cheat.c"

src/drivers/libretro/libretro.c

@@ -23,7 +23,7 @@
 #include "../../fds.h"
 
 #include <string.h>
-#include "memstream.h"
+#include "../../memstream.h"
 
 #if defined(_3DS)
 void* linearMemAlign(size_t size, size_t alignment);

src/drivers/libretro/memstream.c

@@ -1,133 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include "memstream.h"
-
-static uint8_t *g_buffer = NULL;
-static size_t g_size = 0;
-static size_t g_last_file_size = 0;
-
-struct memstream
-{
-   uint8_t *m_buf;
-   size_t m_size;
-   size_t m_ptr;
-   size_t m_max_ptr;
-   unsigned writing;
-};
-
-static void memstream_update_ptr(memstream_t *stream)
-{
-   if (stream->m_ptr > stream->m_max_ptr)
-      stream->m_max_ptr = stream->m_ptr;
-}
-
-static void memstream_init(memstream_t *stream, uint8_t *buffer, size_t max_size, unsigned writing)
-{
-	stream->m_buf = buffer;
-	stream->m_size = max_size;
-	stream->m_ptr = 0;
-	stream->m_max_ptr = 0;
-   stream->writing = writing;
-}
-
-void memstream_set_buffer(uint8_t *buffer, size_t size)
-{
-   g_buffer = buffer;
-   g_size = size;
-}
-
-size_t memstream_get_last_size(void)
-{
-   return g_last_file_size;
-}
-
-memstream_t *memstream_open(unsigned writing)
-{
-   memstream_t *stream;
-   if (!g_buffer || !g_size)
-      return NULL;
-
-   stream = (memstream_t*)calloc(1, sizeof(*stream));
-   memstream_init(stream, g_buffer, g_size, writing);
-   g_buffer = NULL;
-   g_size = 0;
-   return stream;
-}
-
-void memstream_close(memstream_t *stream)
-{
-   g_last_file_size = stream->writing ? stream->m_max_ptr : stream->m_size;
-   free(stream);
-}
-
-size_t memstream_read(memstream_t *stream, void *data, size_t bytes)
-{
-   size_t avail = stream->m_size - stream->m_ptr;
-   if (bytes > avail)
-      bytes = avail;
-
-   memcpy(data, stream->m_buf + stream->m_ptr, bytes);
-   stream->m_ptr += bytes;
-   memstream_update_ptr(stream);
-   return bytes;
-}
-
-size_t memstream_write(memstream_t *stream, const void *data, size_t bytes)
-{
-   size_t avail = stream->m_size - stream->m_ptr;
-   if (bytes > avail)
-      bytes = avail;
-
-   memcpy(stream->m_buf + stream->m_ptr, data, bytes);
-   stream->m_ptr += bytes;
-   memstream_update_ptr(stream);
-   return bytes;
-}
-
-int memstream_seek(memstream_t *stream, int offset, int whence)
-{
-   size_t ptr;
-   if (whence == SEEK_SET)
-      ptr = offset;
-   else if (whence == SEEK_CUR)
-      ptr = stream->m_ptr + offset;
-   else if (whence == SEEK_END)
-      ptr = (stream->writing ? stream->m_max_ptr : stream->m_size) + offset;
-   else
-      return -1;
-
-   if (ptr <= stream->m_size)
-   {
-      stream->m_ptr = ptr;
-      return 0;
-   }
-   else
-      return -1;
-}
-
-size_t memstream_pos(memstream_t *stream)
-{
-   return stream->m_ptr;
-}
-
-int memstream_getc(memstream_t *stream)
-{
-   if (stream->m_ptr >= stream->m_size)
-      return EOF;
-   else
-      return stream->m_buf[stream->m_ptr++];
-
-   memstream_update_ptr(stream);
-}
-
-void memstream_putc(memstream_t *stream, int c)
-{
-   if (stream->m_ptr < stream->m_size)
-      stream->m_buf[stream->m_ptr++] = c;
-
-   memstream_update_ptr(stream);
-}
-

src/drivers/libretro/memstream.h

@@ -1,29 +0,0 @@
-#ifndef __MEMSTREAM_H
-#define __MEMSTREAM_H
-
-#include <stddef.h>
-#include <stdint.h>
-#ifndef _MSC_VER
-#include <stdbool.h>
-#else
-#define TRUE 1
-#define FALSE 0
-#endif
-
-typedef struct memstream memstream_t;
-
-memstream_t *memstream_open(unsigned writing);
-void memstream_close(memstream_t *stream);
-
-size_t memstream_read(memstream_t *stream, void *data, size_t bytes);
-size_t memstream_write(memstream_t *stream, const void *data, size_t bytes);
-int memstream_getc(memstream_t *stream);
-void memstream_putc(memstream_t *stream, int c);
-char *memstream_gets(memstream_t *stream, char *buffer, size_t len);
-size_t memstream_pos(memstream_t *stream);
-int memstream_seek(memstream_t *stream, int offset, int whence);
-
-void memstream_set_buffer(uint8_t *buffer, size_t size);
-size_t memstream_get_last_size(void);
-
-#endif