kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.


SVN revision: 24815
This commit is contained in:
ningerso 2006-08-16 18:18:01 +00:00 committed by ningerso
parent a5db61c51e
commit 04090c04d9
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h
View File

@ -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
{

7
legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
View File

@ -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;