conf.h   conf.h 
skipping to change at line 31 skipping to change at line 31
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330, Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
*/ */
#ifndef __FUSION__CONF_H__ #ifndef __DIRECT__CONF_H__
#define __FUSION__CONF_H__ #define __DIRECT__CONF_H__
#include <fusion/types.h> #include <direct/log_domain.h>
struct __Fusion_FusionConfig { typedef enum {
char *tmpfs; /* location of shm file */ DCFL_NONE, /* None is fatal. */
DCFL_ASSERT, /* ASSERT is fatal. */
DCFL_ASSUME /* ASSERT and ASSUME are fatal. */
} DirectConfigFatalLevel;
bool debugshm; typedef enum {
bool madv_remove; DCTS_OTHER,
bool madv_remove_force; DCTS_FIFO,
bool force_slave; DCTS_RR
} DirectConfigThreadScheduler;
gid_t shmfile_gid; /* group that owns shm file */ typedef enum {
DMT_NONE = 0x00000000, /* No message type. */
bool secure_fusion; DMT_BANNER = 0x00000001, /* Startup banner. */
DMT_INFO = 0x00000002, /* Info messages. */
DMT_WARNING = 0x00000004, /* Warnings. */
DMT_ERROR = 0x00000008, /* Error messages: regular, with DFBR
esult, bugs,
system call errors, dlopen errors
*/
DMT_UNIMPLEMENTED = 0x00000010, /* Messages notifying unimplemented f
unctionality. */
DMT_ONCE = 0x00000020, /* One-shot messages .*/
DMT_UNTESTED = 0x00000040, /* Messages notifying unimplemented f
unctionality. */
DMT_BUG = 0x00000080, /* A bug occurred. */
bool defer_destructors; DMT_ALL = 0x000000FF /* All types. */
} DirectMessageType;
int trace_ref; struct __D_DirectConfig {
DirectMessageType quiet;
bool fork_handler; DirectLogLevel log_level;
bool log_all;
bool log_none;
unsigned int call_bin_max_num; bool trace;
unsigned int call_bin_max_data;
pid_t skirmish_warn_on_thread; char *memcpy; /* Don't probe for me
mcpy routines to save a lot of
startup time. Use
this one instead if it's set. */
char **disable_module; /* Never load these m
odules. */
char *module_dir; /* module dir overrid
e */
bool sighandler;
sigset_t dont_catch; /* don't catch these
signals */
DirectLog *log;
DirectConfigFatalLevel fatal;
// @deprecated / FIXME: maybe adapt?
bool debug;
bool debugmem;
bool thread_block_signals;
bool fatal_break; /* Should D_BREAK()
cause a trap? */
int thread_priority;
DirectConfigThreadScheduler thread_scheduler;
int thread_stack_size;
int thread_priority_scale;
char **default_interface_implementation_types;
char **default_interface_implementation_names;
unsigned int perf_dump_interval;
int log_delay_rand_loops;
int log_delay_rand_us;
int log_delay_min_loops;
int log_delay_min_us;
DirectMessageType fatal_messages;
bool nm_for_trace;
}; };
extern FusionConfig FUSION_API *fusion_config; extern DirectConfig DIRECT_API *direct_config;
extern const char DIRECT_API *direct_config_usage;
DirectResult DIRECT_API direct_config_set( const char *name, const
char *value );
/* Retrieve all values set on option 'name'. */
/* Pass an array of char* pointers and number of pointers in 'num'. */
/* The actual returned number of values gets returned in 'ret_num' */
/* The returned option/values respect directfbrc, cmdline options and DFBAR
GS envvar. */
/* The returned pointers are not extra allocated so do not free them! */
DirectResult DIRECT_API direct_config_get( const char *name, char *
*values, const int values_len, int *ret_num );
extern const char FUSION_API *fusion_config_usage; /* Return the integer value for the last occurrance of the passed option's
setting. */
/* Note that 0 is also retuned in case the passed option was not found ot s
et. */
long long DIRECT_API direct_config_get_int_value( const char *na
me );
DirectResult FUSION_API fusion_config_set( const char *name, const long long DIRECT_API direct_config_get_int_value_with_default( c
char *value ); onst char *name,
l
ong long def );
void __Fusion_conf_init( void ); void __D_conf_init( void );
void __Fusion_conf_deinit( void ); void __D_conf_deinit( void );
#endif #endif
 End of changes. 14 change blocks. 
23 lines changed or deleted 109 lines changed or added


 directfb.h   directfb.h 
skipping to change at line 3440 skipping to change at line 3440
DSFLIP_UPDATE = 0x00000800, /* Update from front only, no swapp ing */ DSFLIP_UPDATE = 0x00000800, /* Update from front only, no swapp ing */
DSFLIP_WAITFORSYNC = DSFLIP_WAIT | DSFLIP_ONSYNC DSFLIP_WAITFORSYNC = DSFLIP_WAIT | DSFLIP_ONSYNC
} DFBSurfaceFlipFlags; } DFBSurfaceFlipFlags;
/* /*
* Flags controlling the text layout. * Flags controlling the text layout.
*/ */
typedef enum { typedef enum {
DSTF_NONE = 0x00000000, /* no flags */
DSTF_LEFT = 0x00000000, /* left aligned */ DSTF_LEFT = 0x00000000, /* left aligned */
DSTF_CENTER = 0x00000001, /* horizontally centered */ DSTF_CENTER = 0x00000001, /* horizontally centered */
DSTF_RIGHT = 0x00000002, /* right aligned */ DSTF_RIGHT = 0x00000002, /* right aligned */
DSTF_TOP = 0x00000004, /* y specifies the top DSTF_TOP = 0x00000004, /* y specifies the top
instead of the baseline */ instead of the baseline */
DSTF_BOTTOM = 0x00000008, /* y specifies the bottom DSTF_BOTTOM = 0x00000008, /* y specifies the bottom
instead of the baseline */ instead of the baseline */
DSTF_OUTLINE = 0x00000010, /* enables outline rendering if loa ded font supports it */ DSTF_OUTLINE = 0x00000010, /* enables outline rendering if loa ded font supports it */
DSTF_BLEND_FUNCS = 0x00000020, /* keeps src/dst blend functions as set on destination */
DSTF_TOPLEFT = DSTF_TOP | DSTF_LEFT, DSTF_TOPLEFT = DSTF_TOP | DSTF_LEFT,
DSTF_TOPCENTER = DSTF_TOP | DSTF_CENTER, DSTF_TOPCENTER = DSTF_TOP | DSTF_CENTER,
DSTF_TOPRIGHT = DSTF_TOP | DSTF_RIGHT, DSTF_TOPRIGHT = DSTF_TOP | DSTF_RIGHT,
DSTF_BOTTOMLEFT = DSTF_BOTTOM | DSTF_LEFT, DSTF_BOTTOMLEFT = DSTF_BOTTOM | DSTF_LEFT,
DSTF_BOTTOMCENTER = DSTF_BOTTOM | DSTF_CENTER, DSTF_BOTTOMCENTER = DSTF_BOTTOM | DSTF_CENTER,
DSTF_BOTTOMRIGHT = DSTF_BOTTOM | DSTF_RIGHT DSTF_BOTTOMRIGHT = DSTF_BOTTOM | DSTF_RIGHT
} DFBSurfaceTextFlags; } DFBSurfaceTextFlags;
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 directfb_version.h   directfb_version.h 
skipping to change at line 34 skipping to change at line 34
License along with this library; if not, write to the License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330, Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
*/ */
#ifndef __DIRECTFB_VERSION_H__ #ifndef __DIRECTFB_VERSION_H__
#define __DIRECTFB_VERSION_H__ #define __DIRECTFB_VERSION_H__
#define DIRECTFB_MAJOR_VERSION (1) #define DIRECTFB_MAJOR_VERSION (1)
#define DIRECTFB_MINOR_VERSION (7) #define DIRECTFB_MINOR_VERSION (7)
#define DIRECTFB_MICRO_VERSION (1) #define DIRECTFB_MICRO_VERSION (2)
#define DIRECTFB_BINARY_AGE (0) #define DIRECTFB_BINARY_AGE (0)
#define DIRECTFB_INTERFACE_AGE (0) #define DIRECTFB_INTERFACE_AGE (0)
#endif /* __DIRECTFB_VERSION_H__ */ #endif /* __DIRECTFB_VERSION_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 fusion.h   fusion.h 
skipping to change at line 99 skipping to change at line 99
FusionWorld **ret_world ); FusionWorld **ret_world );
/* /*
* Exits the fusion world. * Exits the fusion world.
* *
* If 'emergency' is true the function won't join but kill the dispatcher t hread. * If 'emergency' is true the function won't join but kill the dispatcher t hread.
*/ */
DirectResult FUSION_API fusion_exit( FusionWorld *world, DirectResult FUSION_API fusion_exit( FusionWorld *world,
bool emergency ); bool emergency );
int FUSION_API fusion_fd( const FusionWorld *world );
DirectResult FUSION_API fusion_dispatch( FusionWorld *world,
size_t buf_size );
DirectResult FUSION_API fusion_stop_dispatcher( FusionWorld *world, DirectResult FUSION_API fusion_stop_dispatcher( FusionWorld *world,
bool emergency ); bool emergency );
/* /*
* Sets the fork() action of the calling Fusionee within the world. * Sets the fork() action of the calling Fusionee within the world.
*/ */
void FUSION_API fusion_world_set_fork_action( FusionWorld *world, void FUSION_API fusion_world_set_fork_action( FusionWorld *world,
FusionForkAction action ); FusionForkAction action );
/* /*
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 init.h   init.h 
skipping to change at line 31 skipping to change at line 31
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330, Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
*/ */
#ifndef __DIRECT__INIT_H__ #ifndef __FUSION__INIT_H__
#define __DIRECT__INIT_H__ #define __FUSION__INIT_H__
#include <direct/types.h> #include <fusion/types.h>
__constructor__ void __D_init_all ( void ); __constructor__ void __Fusion_init_all ( void );
__destructor__ void __D_deinit_all( void ); __destructor__ void __Fusion_deinit_all( void );
#endif #endif
 End of changes. 3 change blocks. 
5 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/