Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
Ecore_Desktop.h ecore_desktop.c
Log Message:
Make global variables extern in the header and declare and initialize in main
file. This fixes build on OS X caused by symbol conflicts from multiple
definitions of those variables.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/Ecore_Desktop.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Ecore_Desktop.h 14 Aug 2006 21:42:53 -0000 1.7
+++ Ecore_Desktop.h 16 Aug 2006 18:18:01 -0000 1.8
@@ -43,12 +43,12 @@
#define E_NEW_BIG(s, n) (s *)malloc(n * sizeof(s))
#define E_FREE(p) { if (p) {free(p); p = NULL;} }
-Ecore_List *ecore_desktop_paths_config;
-Ecore_List *ecore_desktop_paths_menus;
-Ecore_List *ecore_desktop_paths_directories;
-Ecore_List *ecore_desktop_paths_desktops;
-Ecore_List *ecore_desktop_paths_icons;
-Ecore_List *ecore_desktop_paths_kde_legacy;
+extern Ecore_List *ecore_desktop_paths_config;
+extern Ecore_List *ecore_desktop_paths_menus;
+extern Ecore_List *ecore_desktop_paths_directories;
+extern Ecore_List *ecore_desktop_paths_desktops;
+extern Ecore_List *ecore_desktop_paths_icons;
+extern Ecore_List *ecore_desktop_paths_kde_legacy;
struct _Ecore_Desktop
{
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_desktop.c 14 Aug 2006 21:42:53 -0000 1.7
+++ ecore_desktop.c 16 Aug 2006 18:18:01 -0000 1.8
@@ -3,6 +3,13 @@
#include "Ecore_Desktop.h"
#include "ecore_desktop_private.h"
+Ecore_List *ecore_desktop_paths_config = NULL;
+Ecore_List *ecore_desktop_paths_menus = NULL;
+Ecore_List *ecore_desktop_paths_directories = NULL;
+Ecore_List *ecore_desktop_paths_desktops = NULL;
+Ecore_List *ecore_desktop_paths_icons = NULL;
+Ecore_List *ecore_desktop_paths_kde_legacy = NULL;
+
extern int reject_count, not_over_count;
static int init_count = 0;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
