put guards around config.h, remove trailing spaces

SVN revision: 35104
This commit is contained in:
doursse 2008-07-14 10:06:34 +00:00 committed by doursse
parent 70040d4b80
commit d569f393d6
2 changed files with 32 additions and 23 deletions

View File

@ -2,9 +2,12 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h> /* for NULL */
#include "config.h"
#include "Ecore.h"
#include "ecore_private.h"
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
@ -14,6 +17,7 @@
# include "Ecore_WinCE.h"
# include "ecore_wince_private.h"
#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
@ -1022,7 +1026,7 @@ ecore_evas_software_wince_new(Ecore_WinCE_Window *parent,
y = 0;
width = 0;
height = 0;
#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
}
EAPI Ecore_Evas *
@ -1041,7 +1045,7 @@ ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent,
y = 0;
width = 0;
height = 0;
#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
}
EAPI Ecore_Evas *
@ -1060,7 +1064,7 @@ ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent,
y = 0;
width = 0;
height = 0;
#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
}
EAPI Ecore_Evas *
@ -1079,7 +1083,7 @@ ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent,
y = 0;
width = 0;
height = 0;
#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
}
EAPI Ecore_WinCE_Window *
@ -1089,5 +1093,5 @@ ecore_evas_software_wince_window_get(Ecore_Evas *ee)
return (Ecore_WinCE_Window *) _ecore_evas_wince_window_get(ee);
#else
return NULL;
#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
}

View File

@ -1,15 +1,20 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "config.h"
#ifdef _HAVE_CONFIG_H
# include "config.h"
#endif
#include "Ecore.h"
#include "ecore_private.h"
#ifdef BUILD_ECORE_EVAS_X11
# include "Ecore_X.h"
# include "Ecore_X_Atoms.h"
#endif
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
#ifdef BUILD_ECORE_EVAS_X11
#include "Ecore_X.h"
#include "Ecore_X_Atoms.h"
#endif
#ifdef BUILD_ECORE_EVAS_X11
static int _ecore_evas_init_count = 0;