Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
Ecore.h Makefile.am ecore.c ecore_events.c ecore_exe.c
ecore_main.c ecore_plugin.c ecore_private.h ecore_signal.c
ecore_time.c
Log Message:
mingw portability
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Ecore.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Ecore.h 23 Sep 2004 04:58:16 -0000 1.17
+++ Ecore.h 20 Oct 2004 17:51:25 -0000 1.18
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <dlfcn.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
@@ -80,7 +79,9 @@
};
typedef enum _Ecore_Fd_Handler_Flags Ecore_Fd_Handler_Flags;
+#ifndef WIN32
typedef void Ecore_Exe; /**< A handle for spawned processes */
+#endif
typedef void Ecore_Timer; /**< A handle for timers */
typedef void Ecore_Idler; /**< A handle for idlers */
typedef void Ecore_Idle_Enterer; /**< A handle for idle enterers */
@@ -98,6 +99,7 @@
typedef struct _Ecore_Event_Signal_Power Ecore_Event_Signal_Power; /**< Power
signal event */
typedef struct _Ecore_Event_Signal_Realtime Ecore_Event_Signal_Realtime; /**<
Realtime signal event */
+#ifndef WIN32
struct _Ecore_Event_Exe_Exit /** Process exit event */
{
pid_t pid; /**< The process ID of the process that exited */
@@ -109,18 +111,25 @@
void *ext_data; /**< Extension data - not used */
siginfo_t data; /**< Signal info */
};
+#endif
struct _Ecore_Event_Signal_User /** User signal event */
{
int number; /**< The signal number. Either 1 or 2 */
void *ext_data; /**< Extension data - not used */
+
+#ifndef WIN32
siginfo_t data; /**< Signal info */
+#endif
};
struct _Ecore_Event_Signal_Hup /** Hup signal event */
{
void *ext_data; /**< Extension data - not used */
+
+#ifndef WIN32
siginfo_t data; /**< Signal info */
+#endif
};
struct _Ecore_Event_Signal_Exit /** Exit request event */
@@ -129,19 +138,28 @@
int quit : 1; /**< set if the exit request was a quit signal */
int terminate : 1; /**< Set if the exit request was a terminate singal */
void *ext_data; /**< Extension data - not used */
+
+#ifndef WIN32
siginfo_t data; /**< Signal info */
+#endif
};
struct _Ecore_Event_Signal_Power /** Power event */
{
void *ext_data; /**< Extension data - not used */
+
+#ifndef WIN32
siginfo_t data; /**< Signal info */
+#endif
};
struct _Ecore_Event_Signal_Realtime /** Realtime event */
{
int num; /**< The realtime signal's number */
+
+#ifndef WIN32
siginfo_t data; /**< Signal info */
+#endif
};
int ecore_init(void);
@@ -162,7 +180,7 @@
void *ecore_event_current_event_get(void);
-
+#ifndef WIN32
Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
void *ecore_exe_free(Ecore_Exe *exe);
pid_t ecore_exe_pid_get(Ecore_Exe *exe);
@@ -173,6 +191,7 @@
void ecore_exe_kill(Ecore_Exe *exe);
void ecore_exe_signal(Ecore_Exe *exe, int num);
void ecore_exe_hup(Ecore_Exe *exe);
+#endif
Ecore_Idler *ecore_idler_add(int (*func) (void *data), const void *data);
void *ecore_idler_del(Ecore_Idler *idler);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 5 Sep 2004 08:00:10 -0000 1.5
+++ Makefile.am 20 Oct 2004 17:51:26 -0000 1.6
@@ -30,5 +30,5 @@
ecore_value.c \
ecore_private.h
-libecore_la_LIBADD = -lm @dlopen_libs@
+libecore_la_LIBADD = -lm @dlopen_libs@ @winsock_libs@
libecore_la_LDFLAGS = -version-info 1:0:0
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore.c 5 Sep 2004 08:00:10 -0000 1.7
+++ ecore.c 20 Oct 2004 17:51:26 -0000 1.8
@@ -4,7 +4,9 @@
static const char *_ecore_magic_string_get(Ecore_Magic m);
static int _ecore_init_count = 0;
+#ifndef WIN32
int _ecore_fps_debug = 0;
+#endif
/**
* Set up connections, signal handlers, sockets etc.
@@ -33,9 +35,11 @@
{
if (++_ecore_init_count == 1)
{
+#ifndef WIN32
if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
if (_ecore_fps_debug) _ecore_fps_debug_init();
_ecore_signal_init();
+#endif
}
return _ecore_init_count;
@@ -57,16 +61,22 @@
if (--_ecore_init_count)
return _ecore_init_count;
+#ifndef WIN32
if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
+#endif
_ecore_animator_shutdown();
+#ifndef WIN32
_ecore_exe_shutdown();
+#endif
_ecore_idle_enterer_shutdown();
_ecore_idle_exiter_shutdown();
_ecore_idler_shutdown();
_ecore_timer_shutdown();
_ecore_event_shutdown();
_ecore_main_shutdown();
+#ifndef WIN32
_ecore_signal_shutdown();
+#endif
return _ecore_init_count;
}
@@ -134,6 +144,7 @@
return "<UNKNOWN>";
}
+#ifndef WIN32
/* fps debug calls - for debugging how much time your app actually spends */
/* "running" (and the inverse being time spent running)... this does not */
/* account for other apps and multitasking... */
@@ -207,3 +218,4 @@
*(_ecore_fps_runtime_mmap) += tm;
}
}
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_events.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_events.c 9 May 2004 08:06:17 -0000 1.12
+++ ecore_events.c 20 Oct 2004 17:51:26 -0000 1.13
@@ -417,6 +417,7 @@
event_handlers_delete_me = 0;
}
+#ifndef WIN32
void *
_ecore_event_exe_exit_new(void)
{
@@ -435,6 +436,7 @@
if (e->exe) _ecore_exe_free(e->exe);
free(e);
}
+#endif
void *
_ecore_event_signal_user_new(void)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_exe.c 22 Sep 2004 04:25:35 -0000 1.5
+++ ecore_exe.c 20 Oct 2004 17:51:27 -0000 1.6
@@ -5,6 +5,7 @@
#include <signal.h>
#include <unistd.h>
+#ifndef WIN32
static Ecore_Exe *exes = NULL;
/**
@@ -259,3 +260,4 @@
free(exe);
return data;
}
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ecore_main.c 23 Sep 2004 04:05:13 -0000 1.13
+++ ecore_main.c 20 Oct 2004 17:51:27 -0000 1.14
@@ -1,6 +1,10 @@
#include "ecore_private.h"
#include "Ecore.h"
+#ifdef WIN32
+#include <winsock.h>
+#endif
+
#define FIX_HZ 1
#include <sys/time.h>
@@ -304,7 +308,9 @@
if (fdh->fd > max_fd) max_fd = fdh->fd;
}
}
+#ifndef WIN32
if (_ecore_signal_count_get()) return -1;
+#endif
ret = select(max_fd + 1, &rfds, &wfds, &exfds, t);
if (ret < 0)
{
@@ -429,8 +435,10 @@
}
/* any timers re-added as a result of these are allowed to go */
_ecore_timer_enable_new();
+#ifndef WIN32
/* process signals into events .... */
while (_ecore_signal_count_get()) _ecore_signal_call();
+#endif
if (_ecore_event_exist())
{
int ret;
@@ -451,7 +459,9 @@
ret = _ecore_main_select(0);
if (ret > 0) have_event = 1;
+#ifndef WIN32
if (_ecore_signal_count_get() > 0) have_signal = 1;
+#endif
if (have_signal || have_event)
goto process_events;
@@ -476,12 +486,14 @@
return;
}
+#ifndef WIN32
if (_ecore_fps_debug)
{
t2 = ecore_time_get();
if ((t1 > 0.0) && (t2 > 0.0))
_ecore_fps_debug_runtime_add(t2 - t1);
}
+#endif
start_loop:
if (do_quit)
{
@@ -501,7 +513,9 @@
ret = _ecore_main_select(-1);
if (ret > 0) have_event = 1;
+#ifndef WIN32
if (_ecore_signal_count_get() > 0) have_signal = 1;
+#endif
}
/* idlers */
else
@@ -514,7 +528,9 @@
if (_ecore_event_exist()) break;
ret = _ecore_main_select(0);
if (ret > 0) have_event = 1;
+#ifndef WIN32
if (_ecore_signal_count_get() > 0) have_signal = 1;
+#endif
if (have_event || have_signal) break;
next_time = _ecore_timer_next_get();
if (next_time >= 0) goto start_loop;
@@ -532,7 +548,9 @@
ret = _ecore_main_select(next_time);
if (ret > 0) have_event = 1;
+#ifndef WIN32
if (_ecore_signal_count_get() > 0) have_signal = 1;
+#endif
}
/* idlers */
else
@@ -546,7 +564,9 @@
if (_ecore_event_exist()) break;
ret = _ecore_main_select(0);
if (ret > 0) have_event = 1;
+#ifndef WIN32
if (_ecore_signal_count_get() > 0) have_signal = 1;
+#endif
if ((have_event) || (have_signal)) break;
cur_time = ecore_time_get();
t = ecore_time_get() - cur_time;
@@ -557,10 +577,12 @@
}
}
}
+#ifndef WIN32
if (_ecore_fps_debug)
{
t1 = ecore_time_get();
}
+#endif
/* we came out of our "wait state" so idle has exited */
if (!once_only)
_ecore_idle_exiter_call();
@@ -571,8 +593,10 @@
if (have_event) _ecore_main_fd_handlers_call();
do
{
+#ifndef WIN32
/* process signals into events .... */
while (_ecore_signal_count_get()) _ecore_signal_call();
+#endif
/* handle events ... */
_ecore_event_call();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_plugin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_plugin.c 12 Aug 2004 11:29:18 -0000 1.3
+++ ecore_plugin.c 20 Oct 2004 17:51:27 -0000 1.4
@@ -1,5 +1,8 @@
#include <Ecore.h>
+#ifndef WIN32
+#include <dlfcn.h>
+
static Ecore_List *loaded_plugins = NULL;
/**
@@ -103,3 +106,4 @@
return ret;
}
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_private.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore_private.h 5 Sep 2004 08:00:10 -0000 1.9
+++ ecore_private.h 20 Oct 2004 17:51:27 -0000 1.10
@@ -9,8 +9,14 @@
#include <signal.h>
#include <sys/stat.h>
#include <fcntl.h>
+
+#ifndef WIN32
#include <sys/mman.h>
+#endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define ECORE_MAGIC_NONE 0x1234fedc
#define ECORE_MAGIC_EXE 0xf7e812f5
@@ -49,7 +55,9 @@
};
typedef enum _Ecore_Fd_Handler_Flags Ecore_Fd_Handler_Flags;
+#ifndef WIN32
typedef struct _Ecore_Exe Ecore_Exe;
+#endif
typedef struct _Ecore_Timer Ecore_Timer;
typedef struct _Ecore_Idler Ecore_Idler;
typedef struct _Ecore_Idle_Enterer Ecore_Idle_Enterer;
@@ -60,6 +68,7 @@
typedef struct _Ecore_Event Ecore_Event;
typedef struct _Ecore_Animator Ecore_Animator;
+#ifndef WIN32
struct _Ecore_Exe
{
Ecore_Oldlist __list_data;
@@ -67,6 +76,7 @@
pid_t pid;
void *data;
};
+#endif
struct _Ecore_Timer
{
@@ -193,8 +203,10 @@
void *_ecore_event_del(Ecore_Event *event);
void _ecore_event_call(void);
+#ifndef WIN32
void *_ecore_event_exe_exit_new(void);
void _ecore_event_exe_exit_free(void *data, void *ev);
+#endif
void *_ecore_event_signal_user_new(void);
void *_ecore_event_signal_hup_new(void);
void *_ecore_event_signal_exit_new(void);
@@ -208,9 +220,11 @@
int _ecore_signal_count_get(void);
void _ecore_signal_call(void);
+#ifndef WIN32
void _ecore_exe_shutdown(void);
Ecore_Exe *_ecore_exe_find(pid_t pid);
void *_ecore_exe_free(Ecore_Exe *exe);
+#endif
void _ecore_animator_shutdown(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_signal.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_signal.c 29 Sep 2004 10:23:55 -0000 1.11
+++ ecore_signal.c 20 Oct 2004 17:51:28 -0000 1.12
@@ -1,6 +1,8 @@
#include "ecore_private.h"
#include "Ecore.h"
+#ifndef WIN32
+
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
@@ -445,3 +447,4 @@
sig_count++;
}
#endif
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_time.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_time.c 23 Sep 2004 04:58:16 -0000 1.4
+++ ecore_time.c 20 Oct 2004 17:51:28 -0000 1.5
@@ -3,6 +3,29 @@
#include <sys/time.h>
+#ifndef HAVE_GETTIMEOFDAY
+#ifdef WIN32
+#include <sys/timeb.h>
+
+static int gettimeofday (struct timeval *tv, void *unused)
+{
+ struct _timeb t;
+
+ if (!tv)
+ return -1;
+
+ _ftime (&t);
+
+ tv->tv_sec = t.time;
+ tv->tv_usec = t.millitm * 1000;
+
+ return 0;
+}
+#else
+#error "Your platform isn't supported yet"
+#endif
+#endif
+
/**
* Retrieves the current system time as a floating point value in seconds.
* @return The number of seconds since 12.00AM 1st January 1970.
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
