Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_config
Modified Files:
Ecore_Config.h Makefile.am edb.c ipc_main.c util.c util.h
Added Files:
ipc_ecore.c
Log Message:
Minor changes to ecore_config to make it compile on OS X.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Ecore_Config.h 6 Dec 2003 17:37:20 -0000 1.3
+++ Ecore_Config.h 31 Dec 2003 22:15:33 -0000 1.4
@@ -38,10 +38,11 @@
#ifdef ECORE_CONFIG_DEBUG
# define D(fmt,args...) do { if(DEBUG>=0) fprintf(stderr,fmt,## args); } while(0);
+# define E(lvl,args...) do { if(DEBUG>=(lvl)) fprintf(stderr,## args); } while(0)
#else
# define D(msg,args...)
+# define E(lvl,args...) do { } while(0)
#endif
-#define E(lvl,fmt,args...) do { if(DEBUG>=(lvl)) fprintf(stderr,fmt,## args); }
while(0)
/* structures */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 29 Dec 2003 23:09:57 -0000 1.6
+++ Makefile.am 31 Dec 2003 22:15:33 -0000 1.7
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = ipc
-
INCLUDES = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_ipc
@@ -18,11 +16,12 @@
libecore_config_la_SOURCES = \
ecore_config.c \
ipc_main.c \
+ipc_ecore.c \
util.c \
edb.c
libecore_config_la_LIBADD = \
-$(top_builddir)/src/lib/ecore/libecore.la
+$(top_builddir)/src/lib/ecore/libecore.la -ldl
libecore_config_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
@@ -33,6 +32,7 @@
Ecore_Config.h \
ecore_config.c \
ipc_main.c \
+ipc_ecore.c \
ipc.h \
util.c \
util.h \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/edb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edb.c 19 Dec 2003 16:31:14 -0000 1.3
+++ edb.c 31 Dec 2003 22:15:33 -0000 1.4
@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
int ecore_config_load(Ecore_Config_Bundle *b) {
char* file = malloc(1024); /* ### fixme */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ipc_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ipc_main.c 17 Dec 2003 11:05:28 -0000 1.3
+++ ipc_main.c 31 Dec 2003 22:15:33 -0000 1.4
@@ -34,7 +34,7 @@
static ipc *ipc_modules=NULL;
-static ulong ipc_timer=0L;
+static unsigned long ipc_timer=0L;
Ecore_Config_Server *srv2ecore_config_srv(void *srv) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- util.c 17 Dec 2003 11:05:28 -0000 1.3
+++ util.c 31 Dec 2003 22:15:33 -0000 1.4
@@ -3,7 +3,7 @@
/*#include <glib.h>*/
#include <sys/types.h>
-/*#include <sys/time.h>*/ /* gimetimeofday() */
+#include <sys/time.h> /* gimetimeofday() */
#include <stdio.h> /* NULL */
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* str...() */
@@ -111,9 +111,9 @@
-ulong now(long delay) {
+unsigned long now(long delay) {
static struct timeval tv;
- ulong r;
+ unsigned long r;
gettimeofday(&tv,NULL);
r=tv.tv_sec*1000+(((float)tv.tv_usec)/1000.0)+delay;
return r; }
@@ -239,7 +239,7 @@
-ulong timeout_add(uint f,int(*fun)(void *),void *data) {
+unsigned long timeout_add(uint f,int(*fun)(void *),void *data) {
#ifdef HAVE_GLIB2
return g_timeout_add((guint)f,(GSourceFunc)fun,(gpointer)data);
#endif
@@ -247,7 +247,7 @@
-int timeout_remove(ulong handle) {
+int timeout_remove(unsigned long handle) {
#ifdef HAVE_GLIB2
return g_source_remove(handle)?ECORE_CONFIG_ERR_SUCC:ECORE_CONFIG_ERR_FAIL;
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/util.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- util.h 17 Dec 2003 11:05:28 -0000 1.3
+++ util.h 31 Dec 2003 22:15:33 -0000 1.4
@@ -14,7 +14,7 @@
int parse_line(char *,char **,char **,char **,char **);
char *unit_size(char *size);
-/*ulong now(long delay);*/
+/*unsigned long now(long delay);*/
void qsrt(void *a[],void *data,int lo,int hi,int (*compare)(const void *,const
void *,const void *));
int dlmulti(char *name,char *file,int flag,void **libr,const char *fmt, ...);
@@ -53,6 +53,6 @@
-/*ulong timeout_add(uint f,int(*fun)(void *),void *data);*/
-/*int timeout_remove(ulong handle);*/
+unsigned long timeout_add(unsigned int f,int(*fun)(void *),void *data);
+int timeout_remove(unsigned long handle);
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
