Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/evil
Dir : e17/proto/evil/src/lib/dlfcn
Modified Files:
dlfcn.c dlfcn.h
Log Message:
fix compilation with cegcc and minor fixing
* COPYING:
copyright update
* configure.ac:
* src/lib/Evil.h:
* src/lib/dlfcn/dlfcn.h:
* src/lib/mman/sys/mman.h:
define EFL_EVIL_BUILD in config.h for managing correctly EAPI
* src/bin/test_pipe.c:
stdio.h is needed after winsock2.h for mingw32ce
* src/lib/dlfcn/dlfcn.c (get_last_error), (dlopen), (dlsym):
* src/lib/evil.c:
fix some heafer files inclusion on cegc platform.
first step of mingw32ce support
* src/lib/mman/mman.c:
define _get_osfhandle for mingw32ce
===================================================================
RCS file: /cvs/e/e17/proto/evil/src/lib/dlfcn/dlfcn.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- dlfcn.c 27 Feb 2008 21:01:30 -0000 1.1
+++ dlfcn.c 5 Mar 2008 09:19:38 -0000 1.2
@@ -4,6 +4,10 @@
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
+#ifdef __MINGW32CE__
+# include <limits.h>
+#endif /* __MINGW32CE__ */
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif /* HAVE_CONFIG_H */
@@ -18,7 +22,7 @@
static char *dl_err = NULL;
static int dl_err_viewed = 0;
-#ifdef __CEGCC__
+#if defined(__CEGCC__) || defined(__MINGW32CE__)
static wchar_t *
string_to_wchar(const char *text)
@@ -61,8 +65,7 @@
return atext;
}
-
-#endif /* __CEGCC__ */
+#endif /* __CEGCC__ || __MINGW32CE__ */
static void
get_last_error(char *desc)
@@ -79,11 +82,11 @@
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR)&str, 0, NULL);
-#ifdef __CEGCC__
+#if defined(__CEGCC__) || defined(__MINGW32CE__)
str2 = wchar_to_string(str);
#else
str2 = str;
-#endif /* __CEGCC__ */
+#endif /* ! __CEGCC__ && ! __MINGW32CE__ */
l1 = strlen(desc);
l2 = strlen(str2);
@@ -139,7 +142,7 @@
else
new_path[i] = path[i];
}
-#ifdef __CEGCC__
+#if defined(__CEGCC__) || defined(__MINGW32CE__)
{
wchar_t *wpath;
@@ -151,7 +154,7 @@
#else
module = LoadLibraryEx(new_path, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
-#endif /* __CEGCC__ */
+#endif /* ! __CEGCC__ && ! __MINGW32CE__ */
if (!module)
get_last_error("LoadLibraryEx returned: ");
@@ -178,7 +181,7 @@
{
FARPROC fp;
-#ifdef __CEGCC__
+#if defined(__CEGCC__) || defined(__MINGW32CE__)
{
wchar_t *wsymbol;
@@ -188,7 +191,7 @@
}
#else
fp = GetProcAddress(handle, symbol);
-#endif /* __CEGCC__ */
+#endif /* ! __CEGCC__ && ! __MINGW32CE__ */
if (!fp)
get_last_error("GetProcAddress returned: ");
===================================================================
RCS file: /cvs/e/e17/proto/evil/src/lib/dlfcn/dlfcn.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- dlfcn.h 2 Mar 2008 07:03:37 -0000 1.3
+++ dlfcn.h 5 Mar 2008 09:19:38 -0000 1.4
@@ -6,16 +6,21 @@
#endif /* EAPI */
#ifdef _WIN32
-# ifdef DLL_EXPORT
-# define EAPI __declspec(dllexport)
+# ifdef EFL_EVIL_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_EVIL_BUILD */
#endif /* _WIN32 */
#ifdef __cplusplus
extern "C" {
#endif
+
/**
* @def RTLD_LAZY
-------------------------------------------------------------------------
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
