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 __DIRECT__CONF_H__ #ifndef __FUSION__CONF_H__
#define __DIRECT__CONF_H__ #define __FUSION__CONF_H__
#include <direct/log_domain.h> #include <fusion/types.h>
typedef enum { struct __Fusion_FusionConfig {
DCFL_NONE, /* None is fatal. */ char *tmpfs; /* location of shm file */
DCFL_ASSERT, /* ASSERT is fatal. */
DCFL_ASSUME /* ASSERT and ASSUME are fatal. */
} DirectConfigFatalLevel;
typedef enum { bool debugshm;
DCTS_OTHER, bool madv_remove;
DCTS_FIFO, bool madv_remove_force;
DCTS_RR bool force_slave;
} DirectConfigThreadScheduler;
typedef enum { gid_t shmfile_gid; /* group that owns shm file */
DMT_NONE = 0x00000000, /* No message type. */
DMT_BANNER = 0x00000001, /* Startup banner. */ bool secure_fusion;
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. */
DMT_ALL = 0x000000FF /* All types. */ bool defer_destructors;
} DirectMessageType;
struct __D_DirectConfig { int trace_ref;
DirectMessageType quiet;
DirectLogLevel log_level; bool fork_handler;
bool log_all;
bool log_none;
bool trace; unsigned int call_bin_max_num;
unsigned int call_bin_max_data;
char *memcpy; /* Don't probe for me pid_t skirmish_warn_on_thread;
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;
int delay_trap_ms;
bool sighandler_thread;
}; };
extern DirectConfig DIRECT_API *direct_config; extern FusionConfig FUSION_API *fusion_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 );
/* Return the integer value for the last occurrance of the passed option's extern const char FUSION_API *fusion_config_usage;
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 );
long long DIRECT_API direct_config_get_int_value_with_default( c DirectResult FUSION_API fusion_config_set( const char *name, const
onst char *name, char *value );
l
ong long def );
void __D_conf_init( void ); void __Fusion_conf_init( void );
void __D_conf_deinit( void ); void __Fusion_conf_deinit( void );
#endif #endif
 End of changes. 14 change blocks. 
113 lines changed or deleted 23 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 (5) #define DIRECTFB_MICRO_VERSION (6)
#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


 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/