Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h Eet_private.h Makefile.am eet_data.c eet_dictionary.c
eet_image.c eet_lib.c eet_memfile.c eet_utils.c
Log Message:
* define EAPI on Windows according to the following scheme:
- if Eet is built:
. if the shared lib is built, EAPI must be __declspec(dllexport)
. if the static lib is built, EAPI must be empty
- otherwise EAPI must be __declspec(dllimport)
* move config.h from Eet_private.h to source files so that
EAPI is correctly defined in Eet.h
* add notes for compilation with cegcc and mingw32ce in INSTALL
* add support for compilation with cegcc
* add indentation information for vi
* remove trailing spaces
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- Eet.h 7 Mar 2008 09:59:37 -0000 1.48
+++ Eet.h 8 Mar 2008 07:28:12 -0000 1.49
@@ -4,14 +4,19 @@
#include <stdlib.h>
#ifdef EAPI
-#undef EAPI
+# undef EAPI
#endif
+
#ifdef _WIN32
-# ifdef DLL_EXPORT
-# define EAPI __declspec(dllexport)
+# ifdef EFL_EET_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_EET_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -22,7 +27,7 @@
# else
# define EAPI
# endif
-#endif
+#endif /* ! _WIN32 */
#ifdef __cplusplus
extern "C" {
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Eet_private.h 6 Mar 2008 17:52:59 -0000 1.21
+++ Eet_private.h 8 Mar 2008 07:28:12 -0000 1.22
@@ -1,7 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#ifndef _EET_PRIVATE_H
#define _EET_PRIVATE_H
-
-#include <config.h>
#include <stdio.h>
#include <unistd.h>
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Makefile.am 2 Mar 2008 06:49:48 -0000 1.19
+++ Makefile.am 8 Mar 2008 07:28:12 -0000 1.20
@@ -7,6 +7,7 @@
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
[EMAIL PROTECTED]@ \
@EVIL_CFLAGS@
lib_LTLIBRARIES = libeet.la
@@ -20,6 +21,6 @@
eet_utils.c \
Eet_private.h
-libeet_la_LIBADD = @EVIL_LIBS@ -lz -ljpeg @fnmatch_libs@ @win32_libs@ -lm
+libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm
libeet_la_DEPENDENCIES = $(top_builddir)/config.h
libeet_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- eet_data.c 7 Mar 2008 09:59:37 -0000 1.66
+++ eet_data.c 8 Mar 2008 07:28:12 -0000 1.67
@@ -1,4 +1,12 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h> /* so that EAPI in Eet.h is correctly defined */
+#endif
#include "Eet.h"
#include "Eet_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_dictionary.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eet_dictionary.c 6 Mar 2008 17:52:59 -0000 1.2
+++ eet_dictionary.c 8 Mar 2008 07:28:12 -0000 1.3
@@ -1,4 +1,12 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h> /* so that EAPI in Eet.h is correctly defined */
+#endif
#include "Eet.h"
#include "Eet_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eet_image.c 7 Mar 2008 09:59:37 -0000 1.17
+++ eet_image.c 8 Mar 2008 07:28:12 -0000 1.18
@@ -1,3 +1,11 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h> /* so that EAPI in Eet.h is correctly defined */
+#endif
+
#include "Eet.h"
#include "Eet_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- eet_lib.c 7 Mar 2008 09:59:37 -0000 1.93
+++ eet_lib.c 8 Mar 2008 07:28:12 -0000 1.94
@@ -2,6 +2,10 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h> /* so that EAPI in Eet.h is correctly defined */
+#endif
+
#include "Eet.h"
#include "Eet_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_memfile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- eet_memfile.c 7 Mar 2008 09:59:37 -0000 1.15
+++ eet_memfile.c 8 Mar 2008 07:28:12 -0000 1.16
@@ -1,4 +1,12 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+# include <config.h> /* so that EAPI in Eet.h is correctly defined */
+#endif
#include "Eet.h"
#include "Eet_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eet_utils.c 2 Oct 2007 22:53:00 -0000 1.6
+++ eet_utils.c 8 Mar 2008 07:28:12 -0000 1.7
@@ -1,3 +1,7 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <stdio.h>
#include <math.h>
@@ -7,7 +11,7 @@
int hash_num = 0;
int value, i;
unsigned char *ptr;
-
+
const int masks[9] =
{
0x00,
@@ -20,10 +24,10 @@
0x7f,
0xff
};
-
+
/* no string - index 0 */
if (!key) return 0;
-
+
/* calc hash num */
for (i = 0, ptr = (unsigned char *)key, value = (int)(*ptr);
value;
-------------------------------------------------------------------------
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
