From c963d75dfdeec11f82e79e727062fbf89afa2c04 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 22 Apr 2012 09:19:23 +1000 Subject: Update EFL to latest beta. --- libraries/embryo/src/Makefile.in | 5 ++++ libraries/embryo/src/bin/Makefile.in | 5 ++++ libraries/embryo/src/bin/embryo_cc_sc5.scp | 2 +- libraries/embryo/src/bin/embryo_cc_sc7.scp | 2 +- libraries/embryo/src/lib/Embryo.h | 2 +- libraries/embryo/src/lib/Makefile.am | 3 +- libraries/embryo/src/lib/Makefile.in | 8 +++++- libraries/embryo/src/lib/embryo_amx.c | 4 +++ libraries/embryo/src/lib/embryo_str.c | 45 +++++++++++++++++++----------- libraries/embryo/src/lib/embryo_time.c | 6 +++- 10 files changed, 60 insertions(+), 22 deletions(-) (limited to 'libraries/embryo/src') diff --git a/libraries/embryo/src/Makefile.in b/libraries/embryo/src/Makefile.in index ff3d123..e060803 100644 --- a/libraries/embryo/src/Makefile.in +++ b/libraries/embryo/src/Makefile.in @@ -39,6 +39,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ $(top_srcdir)/m4/efl_fnmatch.m4 \ + $(top_srcdir)/m4/efl_gettimeofday.m4 \ $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ @@ -133,6 +134,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@ EVIL_CFLAGS = @EVIL_CFLAGS@ EVIL_LIBS = @EVIL_LIBS@ EXEEXT = @EXEEXT@ +EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ +EXOTIC_LIBS = @EXOTIC_LIBS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -165,6 +168,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/libraries/embryo/src/bin/Makefile.in b/libraries/embryo/src/bin/Makefile.in index a6551be..4eaa4b2 100644 --- a/libraries/embryo/src/bin/Makefile.in +++ b/libraries/embryo/src/bin/Makefile.in @@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ $(top_srcdir)/m4/efl_fnmatch.m4 \ + $(top_srcdir)/m4/efl_gettimeofday.m4 \ $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ @@ -138,6 +139,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@ EVIL_CFLAGS = @EVIL_CFLAGS@ EVIL_LIBS = @EVIL_LIBS@ EXEEXT = @EXEEXT@ +EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ +EXOTIC_LIBS = @EXOTIC_LIBS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -170,6 +173,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/libraries/embryo/src/bin/embryo_cc_sc5.scp b/libraries/embryo/src/bin/embryo_cc_sc5.scp index 8005f79..af3f352 100644 --- a/libraries/embryo/src/bin/embryo_cc_sc5.scp +++ b/libraries/embryo/src/bin/embryo_cc_sc5.scp @@ -18,7 +18,7 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc5.scp 14177 2005-04-13 19:37:01Z tsauerbeck $ + * Version: $Id: embryo_cc_sc5.scp 35497 2008-08-17 07:44:18Z raster $ */ int strexpand(char *dest, unsigned char *source, int maxlen, diff --git a/libraries/embryo/src/bin/embryo_cc_sc7.scp b/libraries/embryo/src/bin/embryo_cc_sc7.scp index 83d49a1..15c80ac 100644 --- a/libraries/embryo/src/bin/embryo_cc_sc7.scp +++ b/libraries/embryo/src/bin/embryo_cc_sc7.scp @@ -19,7 +19,7 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. * - * Version: $Id: embryo_cc_sc7.scp 14177 2005-04-13 19:37:01Z tsauerbeck $ + * Version: $Id: embryo_cc_sc7.scp 35497 2008-08-17 07:44:18Z raster $ */ int strexpand(char *dest, unsigned char *source, int maxlen, diff --git a/libraries/embryo/src/lib/Embryo.h b/libraries/embryo/src/lib/Embryo.h index 74c872b..4003f6b 100644 --- a/libraries/embryo/src/lib/Embryo.h +++ b/libraries/embryo/src/lib/Embryo.h @@ -10,7 +10,7 @@ These routines are used for Embryo. @version 1.0.0 @author Carsten Haitzler @author Compuphase http://www.compuphase.com -@date 2004-2011 +@date 2004-2012 @section intro What is Embryo? diff --git a/libraries/embryo/src/lib/Makefile.am b/libraries/embryo/src/lib/Makefile.am index f5c78aa..d2ccb55 100644 --- a/libraries/embryo/src/lib/Makefile.am +++ b/libraries/embryo/src/lib/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @EVIL_CFLAGS@ \ +@EXOTIC_CFLAGS@ \ @EMBRYO_CPPFLAGS@ \ @EFL_EMBRYO_BUILD@ @@ -29,7 +30,7 @@ embryo_str.c \ embryo_time.c libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ -libembryo_la_LIBADD = @EVIL_LIBS@ -lm +libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ EXTRA_DIST = embryo_private.h diff --git a/libraries/embryo/src/lib/Makefile.in b/libraries/embryo/src/lib/Makefile.in index 3fb5591..c46a03e 100644 --- a/libraries/embryo/src/lib/Makefile.in +++ b/libraries/embryo/src/lib/Makefile.in @@ -42,6 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ $(top_srcdir)/m4/efl_fnmatch.m4 \ + $(top_srcdir)/m4/efl_gettimeofday.m4 \ $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ @@ -154,6 +155,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@ EVIL_CFLAGS = @EVIL_CFLAGS@ EVIL_LIBS = @EVIL_LIBS@ EXEEXT = @EXEEXT@ +EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ +EXOTIC_LIBS = @EXOTIC_LIBS@ FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -186,6 +189,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -264,6 +269,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @EVIL_CFLAGS@ \ +@EXOTIC_CFLAGS@ \ @EMBRYO_CPPFLAGS@ \ @EFL_EMBRYO_BUILD@ @@ -280,7 +286,7 @@ embryo_str.c \ embryo_time.c libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ -libembryo_la_LIBADD = @EVIL_LIBS@ -lm +libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ EXTRA_DIST = embryo_private.h all: all-am diff --git a/libraries/embryo/src/lib/embryo_amx.c b/libraries/embryo/src/lib/embryo_amx.c index 4fa84c5..7a41111 100644 --- a/libraries/embryo/src/lib/embryo_amx.c +++ b/libraries/embryo/src/lib/embryo_amx.c @@ -29,6 +29,10 @@ #include #include +#ifdef HAVE_EXOTIC +# include +#endif + #include "Embryo.h" #include "embryo_private.h" diff --git a/libraries/embryo/src/lib/embryo_str.c b/libraries/embryo/src/lib/embryo_str.c index 46a3284..0c2faa2 100644 --- a/libraries/embryo/src/lib/embryo_str.c +++ b/libraries/embryo/src/lib/embryo_str.c @@ -2,28 +2,41 @@ # include "config.h" #endif -#include -#include -#include -#include - +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif #ifdef HAVE_ALLOCA_H # include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus +#elif !defined alloca +# ifdef __GNUC__ +# define alloca __builtin_alloca +# elif defined _AIX +# define alloca __alloca +# elif defined _MSC_VER +# include +# define alloca _alloca +# elif !defined HAVE_ALLOCA +# ifdef __cplusplus extern "C" -# endif +# endif void *alloca (size_t); +# endif +#endif + +#ifdef HAVE_EXOTIC +# include #endif +#include +#include +#include +#include + #include "Embryo.h" #include "embryo_private.h" diff --git a/libraries/embryo/src/lib/embryo_time.c b/libraries/embryo/src/lib/embryo_time.c index 8392ec3..90c14cf 100644 --- a/libraries/embryo/src/lib/embryo_time.c +++ b/libraries/embryo/src/lib/embryo_time.c @@ -2,7 +2,7 @@ # include "config.h" #endif -#ifndef HAVE_GETTIMEOFDAY +#ifndef EFL_HAVE_GETTIMEOFDAY # error "Your platform isn't supported yet" #endif @@ -17,6 +17,10 @@ # include #endif +#ifdef HAVE_EXOTIC +# include +#endif + #include "Embryo.h" #include "embryo_private.h" -- cgit v1.1