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

@@ -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])
 

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)

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;

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

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 */
 
 /*

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);