From: <enl...@li...> - 2005-06-18 01:01:11
|
Enlightenment CVS committal Author : sebastid Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib Modified Files: Evas.h Makefile.am main.c Log Message: Cleanup some headers. Remove duplicate typedefs and declerations. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas.h,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- Evas.h 22 May 2005 03:02:15 -0000 1.49 +++ Evas.h 18 Jun 2005 01:00:29 -0000 1.50 @@ -18,9 +18,6 @@ # endif #endif -#ifndef EVAS_COMMON_H -#ifndef EVAS_PRIVATE_H - /** * @file * @brief These routines are used for Evas library interaction. @@ -66,17 +63,10 @@ typedef struct _Evas_Smart Evas_Smart; /**< An Evas Smart Object handle */ typedef unsigned long long Evas_Modifier_Mask; /**< An Evas modifier mask type */ -#if 0 /* able to change co-ordinate systems to remove all fp ops */ -typedef double Evas_Coord; /**< A unit in canvas space. Normally a double, but may vary on platforms */ -typedef double Evas_Font_Size; /**< Units to descript font sizes. Normally a double, but may vary on platforms */ -typedef double Evas_Angle; /**< A unit to measure angles (in degrees). Normally a double, but may vary on platforms */ -typedef int Evas_Bool; /**< A boolean. 1 = on/true/yes, 0 = off/false/no */ -#else typedef int Evas_Coord; typedef int Evas_Font_Size; typedef int Evas_Angle; typedef char Evas_Bool; -#endif struct _Evas_List /** A linked list node */ { @@ -117,8 +107,6 @@ const void *data; }; -#endif -#endif typedef struct _Evas_Pixel_Import_Source Evas_Pixel_Import_Source; /**< A source description of pixels for importing pixels */ typedef struct _Evas_Engine_Info Evas_Engine_Info; /**< A generic Evas Engine information structure */ @@ -599,15 +587,9 @@ /* this is not complete and should be considered experimental. use at your */ /* own risk */ -#ifndef EVAS_COMMON_H -#ifndef EVAS_PRIVATE_H - typedef struct _Evas_Imaging_Image Evas_Imaging_Image; typedef struct _Evas_Imaging_Font Evas_Imaging_Font; -#endif -#endif - EAPI Evas_Imaging_Image *evas_imaging_image_load (const char *file, const char *key); EAPI void evas_imaging_image_free (Evas_Imaging_Image *im); EAPI void evas_imaging_image_size_get (Evas_Imaging_Image *im, int *w, int *h); @@ -636,5 +618,3 @@ #endif #endif - - =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Makefile.am 20 Mar 2005 23:44:21 -0000 1.14 +++ Makefile.am 18 Jun 2005 01:00:29 -0000 1.15 @@ -4,10 +4,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = @freetype_cflags@ @x_cflags@ @xcb_cflags@ @qt_cflags@ @DIRECTFB_CFLAGS@ @gl_cflags@ \ - -I. \ +INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include + -I$(top_srcdir)/src/lib/include \ + @freetype_cflags@ @x_cflags@ @xcb_cflags@ @qt_cflags@ @DIRECTFB_CFLAGS@ @gl_cflags@ lib_LTLIBRARIES = libevas.la =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- main.c 22 May 2005 02:49:36 -0000 1.7 +++ main.c 18 Jun 2005 01:00:29 -0000 1.8 @@ -1,6 +1,5 @@ #include "evas_common.h" #include "evas_private.h" -#include "Evas.h" int _evas_alloc_error = 0; static int _evas_debug_init = 0; |