Embryo:

* remove all occurences of cegcc (not supported anymore)
* fix unistd.h guards
* remove useless headers in embryo_cc_prefix.c

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/embryo@61433 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 6e08c63..129fdf1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@ AC_SUBST(pkgconfig_requires_private)
 
 EFL_EMBRYO_BUILD=""
 case "$host_os" in
-   mingw* | cegcc*)
+   mingw*)
    PKG_CHECK_MODULES([EVIL], [evil])
    AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
    requirement_embryo="evil ${requirement_embryo}"
@@ -106,10 +106,12 @@ case "$host_os" in
 esac
 AC_SUBST(EFL_EMBRYO_BUILD)
 
+# For embryo_cc_prefix.c
 PKG_CHECK_MODULES([EINA], [eina >= 1.0.999])
 
 ### Checks for header files
 
+AC_CHECK_HEADERS([unistd.h])
 EFL_CHECK_PATH_MAX
 
 
@@ -134,10 +136,6 @@ case "$host_os" in
    mingw32ce*)
       EMBRYO_CPPFLAGS="-D_WIN32_WCE=0x0420"
       ;;
-   cegcc*)
-      EMBRYO_CPPFLAGS="-D_WIN32_WCE=0x0420"
-      EMBRYO_CFLAGS="-mwin32"
-      ;;
 esac
 AC_SUBST(EMBRYO_CPPFLAGS)
 AC_SUBST(EMBRYO_CFLAGS)
@@ -147,7 +145,7 @@ AC_SUBST(EMBRYO_CFLAGS)
 
 lt_enable_auto_import=""
 case "$host_os" in
-   mingw* | cegcc*)
+   mingw*)
       lt_enable_auto_import="-Wl,--enable-auto-import"
       ;;
 esac
@@ -165,8 +163,8 @@ AC_FUNC_ALLOCA
 EFL_CHECK_FNMATCH([], [AC_MSG_ERROR([Cannot find fnmatch()])])
 
 case "$host_os" in
-   mingw* | cegcc*)
-      AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defined to 1 (MinGW / CeGCC platform)])
+   mingw*)
+      AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defined to 1 (MinGW platform)])
       ;;
    *)
       AC_CHECK_FUNCS(gettimeofday)

diff --git a/src/bin/embryo_cc_prefix.c b/src/bin/embryo_cc_prefix.c
index 4774a97..ad46e5c 100644 (file)
--- a/src/bin/embryo_cc_prefix.c
+++ b/src/bin/embryo_cc_prefix.c
@@ -2,33 +2,6 @@
 # include <config.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <math.h>
-#include <fnmatch.h>
-#include <limits.h>
-#include <ctype.h>
-#include <time.h>
-#include <dirent.h>
-
-#ifndef _MSC_VER
-# include <unistd.h>
-# include <sys/param.h>
-#endif
-
-#ifdef HAVE_EVIL
-# include <Evil.h>      /* for realpath */
-#else
-# include <pwd.h>
-# include <grp.h>
-# include <glob.h>
-#endif /* ! HAVE_EVIL */
-
 #include <Eina.h>
 
 #include "embryo_cc_prefix.h"

diff --git a/src/bin/embryo_cc_sc1.c b/src/bin/embryo_cc_sc1.c
index eee2803..1806796 100644 (file)
--- a/src/bin/embryo_cc_sc1.c
+++ b/src/bin/embryo_cc_sc1.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef _MSC_VER
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 

diff --git a/src/bin/embryo_cc_sc5.c b/src/bin/embryo_cc_sc5.c
index ebbd6a0..a8af498 100644 (file)
--- a/src/bin/embryo_cc_sc5.c
+++ b/src/bin/embryo_cc_sc5.c
@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#ifndef _MSC_VER
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif