remove a bit the mess n ecore. It's just the first patch...

* add vim header
 * include config.h when necessary
 * fix the order of some include
 * move the standard header in ecore_private.h to the source files

I have recompiled all the efl and e17, and e17 seems to work fine with these changes.
If you encounter problems with that commit, let me know.


SVN revision: 38864
This commit is contained in:
Vincent Torri 2009-01-31 18:33:39 +00:00
parent fa452d770d
commit e18508b701
96 changed files with 737 additions and 130 deletions

View File

@ -116,6 +116,7 @@ AC_SUBST(lt_enable_auto_import)
dnl check common functions and headers
AC_CHECK_FUNCS(gettimeofday)
AC_CHECK_FUNCS(strlcpy)
AC_FUNC_ALLOCA
dnl gnutls
want_gnutls="yes"

View File

@ -1,8 +1,8 @@
#ifndef _ECORE_GETOPT_H
#define _ECORE_GETOPT_H
#include <Eina.h>
#include <stdio.h>
#include <Eina.h>
#ifdef EAPI
# undef EAPI

View File

@ -12,10 +12,11 @@ Ecore_Getopt.h
libecore_la_SOURCES = \
ecore.c \
ecore_app.c \
ecore_anim.c \
ecore_app.c \
ecore_events.c \
ecore_exe.c \
ecore_getopt.c \
ecore_hash.c \
ecore_idle_enterer.c \
ecore_idle_exiter.c \
@ -25,6 +26,7 @@ ecore_main.c \
ecore_path.c \
ecore_pipe.c \
ecore_plugin.c \
ecore_poll.c \
ecore_sheap.c \
ecore_signal.c \
ecore_str.c \
@ -32,9 +34,7 @@ ecore_strbuf.c \
ecore_time.c \
ecore_timer.c \
ecore_tree.c \
ecore_value.c \
ecore_poll.c \
ecore_getopt.c
ecore_value.c
libecore_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ -lm
libecore_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@

View File

@ -1,7 +1,17 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
@ -10,14 +20,18 @@
# include <langinfo.h>
#endif
#include "Ecore.h"
#include "ecore_private.h"
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include <Eina.h>
#include "Ecore.h"
#include "ecore_private.h"
static const char *_ecore_magic_string_get(Ecore_Magic m);
static int _ecore_init_count = 0;

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,7 +1,14 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include <unistd.h>
#ifdef HAVE_EVIL
# include <Evil.h>
#endif

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,7 +1,23 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include <unistd.h>
#include <fcntl.h>
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif /* HAVE_SYS_WAIT_H */
#endif
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,3 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@ -7,8 +11,7 @@
#include <stdarg.h>
#include <ctype.h>
#include <Ecore.h>
#include "Ecore.h"
#include "Ecore_Getopt.h"
static const char *prog = NULL;
@ -18,7 +21,7 @@ static int cols = 80;
static int helpcol = 80 / 3;
static void
_ecore_getopt_help_print_replace_program(FILE *fp, const Ecore_Getopt *parser, const char *text)
_ecore_getopt_help_print_replace_program(FILE *fp, const Ecore_Getopt *parser __UNUSED__, const char *text)
{
do
{
@ -321,7 +324,7 @@ _ecore_getopt_help_desc_store(FILE *fp, const int base, const int total, int use
const Ecore_Getopt_Desc_Store *store = &desc->action_param.store;
char buf[64];
const char *str;
int len;
size_t len;
fputc('\n', fp);
for (used = 0; used < base; used++)
@ -802,7 +805,7 @@ _ecore_getopt_parse_double(const char *str, double *v)
}
static unsigned char
_ecore_getopt_parse_store(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *value, const char *arg_val)
_ecore_getopt_parse_store(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *value, const char *arg_val)
{
const Ecore_Getopt_Desc_Store *store = &desc->action_param.store;
long int v;
@ -922,7 +925,7 @@ _ecore_getopt_parse_store(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *d
}
static unsigned char
_ecore_getopt_parse_store_const(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_store_const(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (!val->ptrp)
{
@ -935,7 +938,7 @@ _ecore_getopt_parse_store_const(const Ecore_Getopt *parser, const Ecore_Getopt_D
}
static unsigned char
_ecore_getopt_parse_store_true(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_store_true(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (!val->boolp)
{
@ -947,7 +950,7 @@ _ecore_getopt_parse_store_true(const Ecore_Getopt *parser, const Ecore_Getopt_De
}
static unsigned char
_ecore_getopt_parse_store_false(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_store_false(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (!val->boolp)
{
@ -959,7 +962,7 @@ _ecore_getopt_parse_store_false(const Ecore_Getopt *parser, const Ecore_Getopt_D
}
static unsigned char
_ecore_getopt_parse_choice(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_choice(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
{
const char * const *pchoice;
@ -993,7 +996,7 @@ _ecore_getopt_parse_choice(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *
}
static unsigned char
_ecore_getopt_parse_append(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_append(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
{
void *data;
long int v;
@ -1113,7 +1116,7 @@ _ecore_getopt_parse_append(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *
}
static unsigned char
_ecore_getopt_parse_count(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_count(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (!val->intp)
{
@ -1169,7 +1172,7 @@ _ecore_getopt_parse_callback(const Ecore_Getopt *parser, const Ecore_Getopt_Desc
}
static unsigned char
_ecore_getopt_parse_help(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_help(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc __UNUSED__, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (val->boolp)
(*val->boolp) = 1;
@ -1178,7 +1181,7 @@ _ecore_getopt_parse_help(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *de
}
static unsigned char
_ecore_getopt_parse_version(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_version(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (val->boolp)
(*val->boolp) = 1;
@ -1192,7 +1195,7 @@ _ecore_getopt_parse_version(const Ecore_Getopt *parser, const Ecore_Getopt_Desc
}
static unsigned char
_ecore_getopt_parse_copyright(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_copyright(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (val->boolp)
(*val->boolp) = 1;
@ -1206,7 +1209,7 @@ _ecore_getopt_parse_copyright(const Ecore_Getopt *parser, const Ecore_Getopt_Des
}
static unsigned char
_ecore_getopt_parse_license(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val)
_ecore_getopt_parse_license(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, Ecore_Getopt_Value *val, const char *arg_val __UNUSED__)
{
if (val->boolp)
(*val->boolp) = 1;
@ -1254,7 +1257,7 @@ _ecore_getopt_desc_handle(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *d
}
static unsigned char
_ecore_getopt_parse_arg_long(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int *idx, int *nonargs, const char *arg)
_ecore_getopt_parse_arg_long(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc __UNUSED__, char **argv, int *idx, int *nonargs, const char *arg)
{
const Ecore_Getopt_Desc *desc;
Ecore_Getopt_Desc_Arg_Requirement arg_req;
@ -1317,7 +1320,7 @@ _ecore_getopt_parse_arg_long(const Ecore_Getopt *parser, Ecore_Getopt_Value *val
}
static unsigned char
_ecore_getopt_parse_arg_short(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int *idx, int *nonargs, const char *arg)
_ecore_getopt_parse_arg_short(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc __UNUSED__, char **argv, int *idx, int *nonargs, const char *arg)
{
int run = 1;
while (run && (arg[0] != '\0'))
@ -1649,7 +1652,7 @@ ecore_getopt_list_free(Eina_List *list)
* @c callback_data value is ignored, you can safely use @c NULL.
*/
unsigned char
ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage)
ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc __UNUSED__, const char *str, void *data __UNUSED__, Ecore_Getopt_Value *storage)
{
Eina_Rectangle *v = (Eina_Rectangle *)storage->ptrp;

View File

@ -1,3 +1,14 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include <string.h>
#include "ecore_private.h"
#include "Ecore.h"
#include "Ecore_Data.h"
@ -413,7 +424,7 @@ _ecore_hash_bucket_destroy(Ecore_Hash_Node *list, Ecore_Free_Cb keyd, Ecore_Free
static int
_ecore_hash_node_add(Ecore_Hash *hash, Ecore_Hash_Node *node)
{
unsigned int hash_val;
unsigned long hash_val;
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
@ -424,7 +435,7 @@ _ecore_hash_node_add(Ecore_Hash *hash, Ecore_Hash_Node *node)
/* Compute the position in the table */
if (!hash->hash_func)
hash_val = (unsigned int)node->key % ecore_prime_table[hash->size];
hash_val = (unsigned long)node->key % ecore_prime_table[hash->size];
else
hash_val = ECORE_COMPUTE_HASH(hash, node->key);
@ -475,14 +486,14 @@ ecore_hash_remove(Ecore_Hash *hash, const void *key)
{
Ecore_Hash_Node *node = NULL;
Ecore_Hash_Node *list;
unsigned int hash_val;
unsigned long hash_val;
void *ret = NULL;
CHECK_PARAM_POINTER_RETURN("hash", hash, NULL);
/* Compute the position in the table */
if (!hash->hash_func)
hash_val = (unsigned int )key % ecore_prime_table[hash->size];
hash_val = (unsigned long )key % ecore_prime_table[hash->size];
else
hash_val = ECORE_COMPUTE_HASH(hash, key);
@ -580,7 +591,7 @@ ecore_hash_find(Ecore_Hash *hash, Ecore_Compare_Cb compare, const void *value)
static Ecore_Hash_Node *
_ecore_hash_node_get(Ecore_Hash *hash, const void *key)
{
unsigned int hash_val;
unsigned long hash_val;
Ecore_Hash_Node *node = NULL;
CHECK_PARAM_POINTER_RETURN("hash", hash, NULL);
@ -592,7 +603,7 @@ _ecore_hash_node_get(Ecore_Hash *hash, const void *key)
/* Compute the position in the table */
if (!hash->hash_func)
hash_val = (unsigned int )key % ecore_prime_table[hash->size];
hash_val = (unsigned long)key % ecore_prime_table[hash->size];
else
hash_val = ECORE_COMPUTE_HASH(hash, key);

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,3 +1,14 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include <string.h>
#include "ecore_private.h"
#include "Ecore.h"
#include "Ecore_Data.h"

View File

@ -11,6 +11,8 @@
# define USER_TIMER_MINIMUM 0x0a
#endif
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <sys/time.h>
#include <sys/types.h>

View File

@ -6,6 +6,13 @@
# include <config.h>
#endif
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
#include "ecore_private.h"
#include "Ecore_Data.h"
#include "Ecore_Str.h"

View File

@ -7,6 +7,7 @@
#endif
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#ifdef HAVE_EVIL

View File

@ -8,13 +8,19 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
#ifdef HAVE_DLFCN_H
# include <dlfcn.h>
#endif
#ifdef HAVE_EVIL_H
# include <evil.h>
# include <Evil.h>
#endif
#include "Ecore_Data.h"
@ -251,7 +257,7 @@ ecore_plugin_available_get(Ecore_Path_Group *group)
}
static Eina_Bool
_hash_keys(const Eina_Hash *hash, const char *key, void *list)
_hash_keys(const Eina_Hash *hash __UNUSED__, const char *key, void *list)
{
ecore_list_append(list, strdup(key));
return EINA_TRUE;

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,32 +1,12 @@
#ifndef _ECORE_PRIVATE_H
#define _ECORE_PRIVATE_H
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif
#include <sys/stat.h>
#include <fcntl.h>
#include <limits.h>
#include <dirent.h>
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
#include <eina_types.h>
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
#ifdef EAPI
# undef EAPI

View File

@ -1,3 +1,14 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include <string.h>
#include "ecore_private.h"
#include "Ecore.h"
#include "Ecore_Data.h"

View File

@ -1,9 +1,20 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifndef _WIN32
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
#include <unistd.h>
#include <assert.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -17,8 +17,18 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <sys/types.h>
#include "ecore_private.h"
#include "Ecore_Str.h"

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include "ecore_private.h"
#include "Ecore.h"
#include "Ecore_Data.h"

View File

@ -6,6 +6,8 @@
# include <config.h>
#endif
#include <stdlib.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif

View File

@ -1,3 +1,14 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include "ecore_private.h"
#include "Ecore.h"

View File

@ -1,3 +1,13 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include "ecore_private.h"
#include "Ecore.h"
#include "Ecore_Data.h"

View File

@ -24,6 +24,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include <string.h>
#include "Ecore.h"
#include "Ecore_Data.h"
#include "ecore_private.h"
@ -100,10 +111,10 @@ ecore_str_hash(const void *key)
EAPI int
ecore_direct_compare(const void *key1, const void *key2)
{
unsigned int k1, k2;
unsigned long k1, k2;
k1 = (unsigned int) key1;
k2 = (unsigned int) key2;
k1 = (unsigned long) key1;
k2 = (unsigned long) key2;
if (k1 > k2)
return 1;

View File

@ -4,9 +4,17 @@
#ifndef _ECORE_CON_H
#define _ECORE_CON_H
#ifdef EAPI
#undef EAPI
#include <time.h>
#include <libgen.h>
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#include <Ecore_Data.h>
#ifdef EAPI
# undef EAPI
#endif
#ifdef _MSC_VER
# ifdef BUILDING_DLL
# define EAPI __declspec(dllexport)
@ -25,13 +33,6 @@
# endif
#endif
#include <time.h>
#include <libgen.h>
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#include <Ecore_Data.h>
/**
* @file Ecore_Con.h
* @brief Sockets functions.

View File

@ -2,13 +2,17 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <sys/stat.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <errno.h>
#include <config.h>
#include <unistd.h>
#include <fcntl.h>
#include "Ecore.h"
#include "ecore_private.h"

View File

@ -1,6 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
/*
* Simple dns lookup
*
@ -26,10 +27,12 @@
*
* * Need more buffer overflow checks.
*/
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_con_private.h"
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include <ctype.h>
#include <netinet/in.h>
#include <sys/socket.h>
@ -37,6 +40,10 @@
#include <arpa/nameser.h>
#include <netdb.h>
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_con_private.h"
typedef struct _CB_Data CB_Data;
struct _CB_Data

View File

@ -1,16 +1,19 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
/*
* getaddrinfo with callback
*
* man getaddrinfo
*
*/
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_con_private.h"
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include <ctype.h>
#include <netinet/in.h>
#include <sys/socket.h>
@ -18,6 +21,10 @@
#include <arpa/nameser.h>
#include <netdb.h>
#include "ecore_private.h"
#include "Ecore.h"
#include "ecore_con_private.h"
typedef struct _CB_Data CB_Data;
struct _CB_Data

View File

@ -2,6 +2,10 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#if USE_GNUTLS
# include <gnutls/gnutls.h>
#elif USE_OPENSSL
@ -256,7 +260,7 @@ _ecore_con_ssl_server_shutdown_gnutls(Ecore_Con_Server *svr)
* should try again later.
*/
static Ecore_Con_State
_ecore_con_ssl_server_try_gnutls(Ecore_Con_Server *svr)
_ecore_con_ssl_server_try_gnutls(Ecore_Con_Server *svr __UNUSED__)
{
return ECORE_CON_CONNECTED;
}

View File

@ -43,15 +43,21 @@
*
* FIXME: Support more CURL features: Authentication, Progress callbacks and more...
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "Ecore.h"
#include "ecore_private.h"
#include "Ecore_Con.h"
#include "ecore_con_private.h"
#include <errno.h>
#include <sys/stat.h>
#include <sys/types.h>
/**
* @defgroup Ecore_Con_Url_Group Ecore URL Connection Functions
*
@ -827,7 +833,7 @@ _ecore_con_url_perform(Ecore_Con_Url *url_con)
}
static int
_ecore_con_url_idler_handler(void *data)
_ecore_con_url_idler_handler(void *data __UNUSED__)
{
double start;
int done = 1;

View File

@ -1,3 +1,11 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <string.h>
#include <ctype.h>
#include <stdio.h>
@ -11,7 +19,6 @@
#include <unistd.h>
#include "Ecore_Config.h"
#include "config.h"
#include "ecore_config_private.h"
#include "ecore_config_ipc.h"

View File

@ -1,3 +1,11 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@ -9,10 +17,11 @@
#include <unistd.h>
#include <locale.h>
#include <Eet.h>
#include "Ecore_Config.h"
#include "ecore_config_private.h"
#include "ecore_config_util.h"
#include <Eet.h>
struct _Ecore_Config_DB_File
{

View File

@ -1,3 +1,11 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@ -8,8 +16,6 @@
#include "Ecore_Config.h"
#include "Ecore.h"
#include "config.h"
typedef struct __Ecore_Config_Arg_Callback _Ecore_Config_Arg_Callback;
struct __Ecore_Config_Arg_Callback
{

View File

@ -1,3 +1,11 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* by Azundris, with thanks to Corey Donohoe <atmos@atmos.org> */
#include <stdio.h>
#include <stdlib.h>
@ -18,7 +26,6 @@
#include "ecore_config_private.h"
#include "Ecore_Config.h"
#include "config.h"
/*****************************************************************************/

View File

@ -1,3 +1,11 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* ############## bad */
#define HAVE_EVAS2
@ -15,7 +23,6 @@
#include "ecore_config_util.h"
#include "ecore_config_ipc.h"
#include "config.h"
#include "ecore_config_private.h"
static Ecore_Config_Server *__ecore_config_servers;

View File

@ -1,3 +1,11 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

View File

@ -1,7 +1,16 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* azundris */
#include <sys/types.h>
#include <stdlib.h> /* malloc(), free() */
#include <stdio.h>
#include <string.h> /* str...() */
#include <stdarg.h> /* varargs in sprintf/appendf */

View File

@ -1,6 +1,9 @@
#ifndef _ECORE_DIRECTFB_H
#define _ECORE_DIRECTFB_H
#include <directfb.h>
#include <Ecore_Data.h>
#ifdef EAPI
#undef EAPI
#endif
@ -22,9 +25,6 @@
# endif
#endif
#include <Ecore_Data.h>
#include <directfb.h>
#ifdef __cplusplus
extern "C" {

View File

@ -1,3 +1,14 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#include <string.h>
#include "ecore_private.h"
#include "Ecore_DirectFB.h"
#include "ecore_directfb_private.h"
@ -643,7 +654,7 @@ ecore_directfb_window_size_get(Ecore_DirectFB_Window *ecore_window, int *w, int
}
EAPI int
ecore_directfb_init(const char *name)
ecore_directfb_init(const char *name __UNUSED__)
{
int i = 0;
@ -695,8 +706,6 @@ ecore_directfb_init(const char *name)
EAPI int
ecore_directfb_shutdown(void)
{
int i;
_ecore_directfb_init_count--;
if (_ecore_directfb_init_count > 0) return _ecore_directfb_init_count;
if (_ecore_directfb_init_count < 0)

View File

@ -1,13 +1,17 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include "Ecore.h"
#include "ecore_private.h"
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
#include <string.h>
static int _ecore_evas_init_count = 0;
static Ecore_Fd_Handler *_ecore_evas_async_events_fd = NULL;

View File

@ -1,4 +1,13 @@
#include "config.h"
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <string.h>
#include "Ecore.h"
#include "ecore_private.h"
#include "ecore_evas_private.h"

View File

@ -1,7 +1,14 @@
/*
* 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 <sys/types.h>
#include <dirent.h>
#include "Ecore.h"
#include "ecore_private.h"
#include "ecore_evas_private.h"

View File

@ -1,4 +1,11 @@
#include "config.h"
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef BUILD_ECORE_EVAS_QUARTZ
#import <Cocoa/Cocoa.h>
#endif