Merge branch 'ecore-glib'

Test with -Dsdl=true

src/examples/ecore/ecore_audio_custom.c

@@ -1,6 +1,8 @@
 // Compile with:
 // gcc -o ecore_audio_custom ecore_audio_custom.c `pkg-config --libs --cflags ecore ecore-audio`
-#define EFL_BETA_API_SUPPORT
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>

src/examples/ecore/ecore_audio_playback.c

@@ -1,6 +1,8 @@
 // Compile with:
 // gcc -o ecore_audio_playback ecore_audio_playback.c `pkg-config --libs --cflags ecore eina ecore-audio`
-#define EFL_BETA_API_SUPPORT
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
 
 #include <stdio.h>
 #include <string.h>

src/examples/ecore/ecore_audio_to_ogg.c

@@ -1,6 +1,8 @@
 // Compile with:
 // gcc -o ecore_audio_to_ogg ecore_audio_to_ogg.c `pkg-config --libs --cflags ecore eina ecore-audio`
-#define EFL_BETA_API_SUPPORT
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
 
 #include <stdio.h>
 #include <libgen.h>

src/lib/elua/elua.c

@@ -193,11 +193,13 @@ elua_state_new(const char *progname)
    lua_setfield(L, LUA_REGISTRYINDEX, "elua_ptr1");
    lua_setfield(L, LUA_REGISTRYINDEX, "elua_ptr2");
    return ret;
+#ifdef ENABLE_LUA_OLD
 err:
    lua_close(L);
    eina_stringshare_del(ret->progname);
    free(ret);
    return NULL;
+#endif
 }
 
 EAPI void

src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c

@@ -458,7 +458,7 @@ static Ecore_Evas_Engine_Func _ecore_sdl_engine_func =
 };
 
 static Ecore_Evas*
-_ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha)
+_ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fullscreen, int hwsurface, int noframe EINA_UNUSED, int alpha)
 {
    Ecore_Evas_SDL_Switch_Data *swd;
    Ecore_Evas *ee;

src/tests/elua/elua_lib.c

@@ -21,9 +21,9 @@ EFL_START_TEST(elua_api)
     lua_State *lst;
     FILE *f;
     int fd;
-    char *cargv[2];
-    char arg1[] = "test";
-    char arg2[] = "test";
+    const char *cargv[2];
+    const char arg1[] = "test";
+    const char arg2[] = "test";
     int quit = 0;
     cargv[0] = arg1;
     cargv[1] = arg2;
@@ -106,14 +106,14 @@ EFL_START_TEST(elua_api)
     fprintf(f, "return true");
     fclose(f);
     cargv[1] = tmpf;
-    fail_if(!elua_util_script_run(st, 2, cargv, 1, &quit));
+    fail_if(!elua_util_script_run(st, 2, (char **)cargv, 1, &quit));
     fail_if(quit != 1);
 
     f = fopen(tmpf, "wb");
     fail_if(!f);
     fprintf(f, "return false");
     fclose(f);
-    fail_if(!elua_util_script_run(st, 2, cargv, 1, &quit));
+    fail_if(!elua_util_script_run(st, 2, (char **)cargv, 1, &quit));
     fail_if(quit != 0);
     fail_if(remove(tmpf));