devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=eefa100be45abc61460f2b82d8cc259badbd9d55
commit eefa100be45abc61460f2b82d8cc259badbd9d55
Author: Vincent Torri <vincent.to...@gmail.com>
Date: Fri Jan 29 11:17:57 2021 -0500
some fixes for the meson build system
Test Plan: compilation
Reviewers: raster, devilhorns
Reviewed By: devilhorns
Differential Revision: https://phab.enlightenment.org/D12236
---
configure.ac | 4 ----
src/bin/commands.c | 1 +
src/bin/grid.c | 2 +-
src/bin/grid_save.c | 4 +++-
src/bin/lz4/lz4.h | 4 ++--
src/bin/main.c | 4 ++--
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 05635da..321ffb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,10 +87,6 @@ EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
efl_version="1.12.0"
-if test "x${have_win32}" = "xyes" ; then
- requirements_libexpress_pc="evil >= ${efl_version}"
-fi
-
requirements_libexpress_pc="ecore-con >= ${efl_version} ecore >=
${efl_version} eina >= ${efl_version} ${requirements_libexpress_pc}"
AC_SUBST([requirements_libexpress_pc])
diff --git a/src/bin/commands.c b/src/bin/commands.c
index bc9dfc5..a0c2b64 100644
--- a/src/bin/commands.c
+++ b/src/bin/commands.c
@@ -1,5 +1,6 @@
#include "private.h"
#include "channel.h"
+#include "commands.h"
static Eina_Bool
_txt_handle(Express_Network *net, const char *name, char *str, char *buff)
diff --git a/src/bin/grid.c b/src/bin/grid.c
index 92ee337..fa98a6a 100644
--- a/src/bin/grid.c
+++ b/src/bin/grid.c
@@ -1626,7 +1626,7 @@ _limit_coord(Grid *sd)
else if (sd->save.cy < 0) sd->save.cy = 0;
}
-ssize_t
+static ssize_t
_line_length(const Grid_Cell *cells, ssize_t nb_cells)
{
ssize_t len = nb_cells;
diff --git a/src/bin/grid_save.c b/src/bin/grid_save.c
index 1c2c930..198d69e 100644
--- a/src/bin/grid_save.c
+++ b/src/bin/grid_save.c
@@ -2,7 +2,9 @@
#include "grid_save.h"
#include "grid.h"
#include "lz4/lz4.h"
-#include <sys/mman.h>
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
#if defined (__MacOSX__) || (defined (__MACH__) && defined (__APPLE__))
# ifndef MAP_ANONYMOUS
diff --git a/src/bin/lz4/lz4.h b/src/bin/lz4/lz4.h
index 1064fa1..b622dac 100644
--- a/src/bin/lz4/lz4.h
+++ b/src/bin/lz4/lz4.h
@@ -176,7 +176,7 @@ typedef struct { unsigned int table[LZ4_STREAMSIZE_U32]; }
LZ4_stream_t;
* provides a pointer (void*) towards an initialized LZ4_stream_t structure.
* LZ4_free just frees it.
*/
-void* LZ4_createStream();
+void* LZ4_createStream(void);
int LZ4_free (void* LZ4_stream);
@@ -234,7 +234,7 @@ typedef struct { unsigned int
table[LZ4_STREAMDECODESIZE_U32]; } LZ4_streamDecod
* provides a pointer (void*) towards an initialized LZ4_streamDecode_t
structure.
* LZ4_free just frees it.
*/
-void* LZ4_createStreamDecode();
+void* LZ4_createStreamDecode(void);
int LZ4_free (void* LZ4_stream); /* yes, it's the same one as for
compression */
/*
diff --git a/src/bin/main.c b/src/bin/main.c
index f963799..88d938e 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -9,14 +9,14 @@
int _log_dom = -1;
/* public functions */
-EAPI_MAIN int
+EAPI_MAIN static int
elm_main(int argc, char **argv)
{
int i = 0;
for (; i < argc; i++)
{
- if ((!strcmp(argv[i], "-v")) || (!strcmp(argv[i], "-version")) ||
+ if ((!strcmp(argv[i], "-v")) || (!strcmp(argv[i], "-version")) ||
(!strcmp(argv[i], "--version")))
{
printf("Version: %s\n", PACKAGE_VERSION);
--
