From: Enlightenment C. <no...@cv...> - 2006-08-16 18:58:00
|
Enlightenment CVS committal Author : sebastid Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_desktop Modified Files: Ecore_Desktop.h ecore_desktop_private.h Log Message: Make headers and macros private =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/Ecore_Desktop.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Ecore_Desktop.h 16 Aug 2006 18:18:01 -0000 1.8 +++ Ecore_Desktop.h 16 Aug 2006 18:57:58 -0000 1.9 @@ -1,15 +1,8 @@ #ifndef _ECORE_DESKTOP_H # define _ECORE_DESKTOP_H -/* FIXME: No unnecessary includes in exported headers, when things settle down and we know what is unnecessary. */ -#include <string.h> -#include <strings.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> #include <Ecore_Data.h> - /** * @file Ecore_Desktop.h * @brief The file that provides the freedesktop.org desktop, icon, and menu @@ -32,16 +25,6 @@ * * For menu file details, see @ref Ecore_Desktop_Menu_Group. */ - - -#define MAX_PATH 4096 - -/* FIXME: No unnecessary macros in exported headers, when things settle down and we know what is unnecessary. */ -#define E_FN_DEL(_fn, _h) if (_h) { _fn(_h); _h = NULL; } -#define E_REALLOC(p, s, n) p = (s *)realloc(p, sizeof(s) * n) -#define E_NEW(s, n) (s *)calloc(n, sizeof(s)) -#define E_NEW_BIG(s, n) (s *)malloc(n * sizeof(s)) -#define E_FREE(p) { if (p) {free(p); p = NULL;} } extern Ecore_List *ecore_desktop_paths_config; extern Ecore_List *ecore_desktop_paths_menus; =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_private.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ecore_desktop_private.h 14 Aug 2006 04:41:44 -0000 1.2 +++ ecore_desktop_private.h 16 Aug 2006 18:57:58 -0000 1.3 @@ -1,7 +1,19 @@ #ifndef _ECORE_DESKTOP_PRIVATE_H # define _ECORE_DESKTOP_PRIVATE_H +#include <string.h> +#include <strings.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> #include <Ecore_File.h> + +#define MAX_PATH 4096 +#define E_FN_DEL(_fn, _h) if (_h) { _fn(_h); _h = NULL; } +#define E_REALLOC(p, s, n) p = (s *)realloc(p, sizeof(s) * n) +#define E_NEW(s, n) (s *)calloc(n, sizeof(s)) +#define E_NEW_BIG(s, n) (s *)malloc(n * sizeof(s)) +#define E_FREE(p) { if (p) {free(p); p = NULL;} } # ifdef __cplusplus extern "C" |