Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_job
Modified Files:
Ecore_Job.h Makefile.am ecore_job.c
Log Message:
integration of evil in ecore. It's compiling on windows and my ubuntu. The
commit is big, please report any problem
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_job/Ecore_Job.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Ecore_Job.h 25 Oct 2007 05:17:57 -0000 1.10
+++ Ecore_Job.h 26 May 2008 05:16:33 -0000 1.11
@@ -1,15 +1,24 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#ifndef _ECORE_JOB_H
#define _ECORE_JOB_H
#ifdef EAPI
-#undef EAPI
+# undef EAPI
#endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_ECORE_JOB_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_ECORE_JOB_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -20,7 +29,7 @@
# else
# define EAPI
# endif
-#endif
+#endif /* ! _WIN32 */
/**
* @file
@@ -30,14 +39,14 @@
#ifdef __cplusplus
extern "C" {
#endif
-
+
#ifndef _ECORE_JOB_PRIVATE_H
typedef void Ecore_Job; /**< A job handle */
#endif
EAPI int ecore_job_init(void);
EAPI int ecore_job_shutdown(void);
-EAPI Ecore_Job *ecore_job_add(void (*func) (void *data), const void *data);
+EAPI Ecore_Job *ecore_job_add(void (*func) (void *data), const void *data);
EAPI void *ecore_job_del(Ecore_Job *job);
#ifdef __cplusplus
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_job/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 4 Nov 2007 09:29:19 -0000 1.8
+++ Makefile.am 26 May 2008 05:16:33 -0000 1.9
@@ -17,7 +17,7 @@
libecore_job_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la
-libecore_job_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
+libecore_job_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@
-version-info @version_info@
libecore_job_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_job/ecore_job.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_job.c 25 Oct 2007 05:17:57 -0000 1.10
+++ ecore_job.c 26 May 2008 05:16:33 -0000 1.11
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "Ecore.h"
#include "ecore_private.h"
#include "ecore_job_private.h"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
