enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

fmting 

SVN revision: 44313
This commit is contained in:
Carsten Haitzler 2009-12-09 07:54:43 +00:00
parent 1f5c54b2f4
commit eac3646b27
2 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
legacy/edje/src/lib/Edje.h
View File

@ -251,50 +251,45 @@ typedef enum _Edje_External_Param_Type Edje_External_Param_Type;
struct _Edje_External_Param struct _Edje_External_Param
{ {
const char *name; const char *name;
Edje_External_Param_Type type; Edje_External_Param_Type type;
// XXX these could be in a union, but eet doesn't support them (or does it?) // XXX these could be in a union, but eet doesn't support them (or does it?)
int i; int i;
double d; double d;
const char *s; const char *s;
}; };
typedef struct _Edje_External_Param Edje_External_Param; typedef struct _Edje_External_Param Edje_External_Param;
#ifndef NAN #define EDJE_EXTERNAL_INT_UNSET 0xffffffff
extern const float *_edje_const_nan; #define EDJE_EXTERNAL_DOUBLE_UNSET 0x1.0p255f
#define NAN (*_edje_const_nan)
#endif
#define EDJE_EXTERNAL_INT_UNSET INT32_MAX
#define EDJE_EXTERNAL_DOUBLE_UNSET NAN
struct _Edje_External_Param_Info struct _Edje_External_Param_Info
{ {
const char *name; const char *name;
Edje_External_Param_Type type; Edje_External_Param_Type type;
union union
{ {
struct struct
{ {
int def, min, max, step; int def, min, max, step;
} i; } i;
struct struct
{ {
double def, min, max, step; double def, min, max, step;
} d; } d;
struct struct
{ {
const char *def; const char *def;
const char *accept_fmt; const char *accept_fmt;
const char *deny_fmt; const char *deny_fmt;
} s; } s;
struct struct
{ {
int def; int def;
const char *false_str; const char *false_str;
const char *true_str; const char *true_str;
} b; } b;
} info; } info;
}; };
typedef struct _Edje_External_Param_Info Edje_External_Param_Info; typedef struct _Edje_External_Param_Info Edje_External_Param_Info;

3
legacy/edje/src/lib/edje_main.c
View File

@ -6,9 +6,6 @@
#include "edje_private.h" #include "edje_private.h"
static const unsigned int _edje_const_nan_int = 0x7fc00000;
const float *_edje_const_nan = (float *)(&(_edje_const_nan_int));
static int _edje_init_count = 0; static int _edje_init_count = 0;
static int _edje_log_dom_global = -1; static int _edje_log_dom_global = -1;
Eina_Mempool *_edje_real_part_mp = NULL; Eina_Mempool *_edje_real_part_mp = NULL;