librdf.h   librdf.h 
skipping to change at line 78 skipping to change at line 78
# else # else
# define REDLAND_CALLBACK_STDCALL # define REDLAND_CALLBACK_STDCALL
# endif # endif
#endif #endif
/* Use gcc 3.1+ feature to allow marking of deprecated API calls. /* Use gcc 3.1+ feature to allow marking of deprecated API calls.
* This gives a warning during compiling. * This gives a warning during compiling.
*/ */
#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
#define REDLAND_DEPRECATED __attribute__((deprecated)) #define REDLAND_DEPRECATED __attribute__((deprecated))
#define REDLAND_NORETURN __attribute__((__noreturn__))
#else #else
#define REDLAND_DEPRECATED #define REDLAND_DEPRECATED
#define REDLAND_NORETURN
#endif #endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \ #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \
__attribute__((__format__(__printf__, string_index, first_to_check_index) )) __attribute__((__format__(__printf__, string_index, first_to_check_index) ))
#else #else
#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index)
#endif #endif
/* Public defines */ /* Public defines */
/** /**
* LIBRDF_VERSION: * LIBRDF_VERSION:
* *
* Redland librdf library version number * Redland librdf library version number
* *
* Format: major * 10000 + minor * 100 + release * Format: major * 10000 + minor * 100 + release
*/ */
#define LIBRDF_VERSION 10015 #define LIBRDF_VERSION 10016
/** /**
* LIBRDF_VERSION_STRING: * LIBRDF_VERSION_STRING:
* *
* Redland librdf library version string * Redland librdf library version string
*/ */
#define LIBRDF_VERSION_STRING "1.0.15" #define LIBRDF_VERSION_STRING "1.0.16"
/** /**
* LIBRDF_VERSION_MAJOR: * LIBRDF_VERSION_MAJOR:
* *
* Redland librdf library major version * Redland librdf library major version
*/ */
#define LIBRDF_VERSION_MAJOR 1 #define LIBRDF_VERSION_MAJOR 1
/** /**
* LIBRDF_VERSION_MINOR: * LIBRDF_VERSION_MINOR:
* *
* Redland librdf library minor version * Redland librdf library minor version
*/ */
#define LIBRDF_VERSION_MINOR 0 #define LIBRDF_VERSION_MINOR 0
/** /**
* LIBRDF_VERSION_RELEASE: * LIBRDF_VERSION_RELEASE:
* *
* Redland librdf library release * Redland librdf library release
*/ */
#define LIBRDF_VERSION_RELEASE 15 #define LIBRDF_VERSION_RELEASE 16
/* Public typedefs (references to private structures) */ /* Public typedefs (references to private structures) */
/** /**
* librdf_world: * librdf_world:
* *
* Redland world class. * Redland world class.
*/ */
typedef struct librdf_world_s librdf_world; typedef struct librdf_world_s librdf_world;
skipping to change at line 312 skipping to change at line 314
* librdf_copyright_string: * librdf_copyright_string:
* *
* Copyright string (multiple lines). * Copyright string (multiple lines).
*/ */
REDLAND_API REDLAND_API
extern const char * const librdf_copyright_string; extern const char * const librdf_copyright_string;
/** /**
* librdf_version_string: * librdf_version_string:
* *
* Raptor version as a string. * Redland librdf version as a string.
*/ */
REDLAND_API REDLAND_API
extern const char * const librdf_version_string; extern const char * const librdf_version_string;
/** /**
* librdf_version_major: * librdf_version_major:
* *
* Raptor major version number. * Redland librdf major version number.
*/ */
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_major; extern const unsigned int librdf_version_major;
/** /**
* librdf_version_minor: * librdf_version_minor:
* *
* Raptor minor version number. * Redland librdf minor version number.
*/ */
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_minor; extern const unsigned int librdf_version_minor;
/** /**
* librdf_version_release: * librdf_version_release:
* *
* Rasqal release version number. * Redland librdf release version number.
*/ */
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_release; extern const unsigned int librdf_version_release;
/** /**
* librdf_version_decimal: * librdf_version_decimal:
* *
* Rasqal version as a decimal number. * Redland librdf version as a decimal number.
* *
* Format: major * 10000 + minor * 100 + release * Format: major * 10000 + minor * 100 + release
*/ */
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_decimal; extern const unsigned int librdf_version_decimal;
/**
* librdf_license_string:
*
* Redland librdf license string.
*/
REDLAND_API
extern const char * const librdf_license_string;
/**
* librdf_home_url_string:
*
* Redland librdf home page URL.
*/
REDLAND_API
extern const char * const librdf_home_url_string;
/* Required for va_list in error handler function registrations /* Required for va_list in error handler function registrations
* which are in the public API * which are in the public API
*/ */
#include <stdarg.h> #include <stdarg.h>
/* internal interfaces */ /* internal interfaces */
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_internal.h> #include <rdf_internal.h>
#endif #endif
 End of changes. 11 change blocks. 
8 lines changed or deleted 26 lines changed or added


 rdf_init.h   rdf_init.h 
skipping to change at line 29 skipping to change at line 29
* See LICENSE.html or LICENSE.txt at the top of this package for the * See LICENSE.html or LICENSE.txt at the top of this package for the
* complete terms and further detail along with the license texts for * complete terms and further detail along with the license texts for
* the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively. * the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively.
* *
* *
*/ */
#ifndef LIBRDF_INIT_H #ifndef LIBRDF_INIT_H
#define LIBRDF_INIT_H #define LIBRDF_INIT_H
typedef void (*librdf_raptor_init_handler)(void* user_data, raptor_world* r
aptor_world_ptr);
typedef void (*librdf_rasqal_init_handler)(void* user_data, rasqal_world* r
asqal_world_ptr);
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_init_internal.h> #include <rdf_init_internal.h>
#endif #endif
#ifndef LIBRDF_OBJC_FRAMEWORK #ifndef LIBRDF_OBJC_FRAMEWORK
#include <rasqal.h> #include <rasqal.h>
#else #else
#include <Redland/rasqal.h> #include <Redland/rasqal.h>
#endif #endif
skipping to change at line 57 skipping to change at line 60
REDLAND_API REDLAND_API
void librdf_world_open(librdf_world *world); void librdf_world_open(librdf_world *world);
REDLAND_API REDLAND_API
void librdf_world_init_mutex(librdf_world *world); void librdf_world_init_mutex(librdf_world *world);
REDLAND_API REDLAND_API
void librdf_world_set_rasqal(librdf_world* world, rasqal_world* rasqal_worl d_ptr); void librdf_world_set_rasqal(librdf_world* world, rasqal_world* rasqal_worl d_ptr);
REDLAND_API REDLAND_API
void librdf_world_set_raptor_init_handler(librdf_world* world, void* user_d
ata, librdf_raptor_init_handler handler);
REDLAND_API
void librdf_world_set_rasqal_init_handler(librdf_world* world, void* user_d
ata, librdf_rasqal_init_handler handler);
REDLAND_API
rasqal_world* librdf_world_get_rasqal(librdf_world* world); rasqal_world* librdf_world_get_rasqal(librdf_world* world);
REDLAND_API REDLAND_API
void librdf_world_set_error(librdf_world* world, void *user_data, librdf_lo g_level_func error_handler); void librdf_world_set_error(librdf_world* world, void *user_data, librdf_lo g_level_func error_handler);
REDLAND_API REDLAND_API
void librdf_world_set_warning(librdf_world* world, void *user_data, librdf_ log_level_func warning_handler); void librdf_world_set_warning(librdf_world* world, void *user_data, librdf_ log_level_func warning_handler);
REDLAND_API REDLAND_API
void librdf_world_set_logger(librdf_world* world, void *user_data, librdf_l og_func log_handler); void librdf_world_set_logger(librdf_world* world, void *user_data, librdf_l og_func log_handler);
REDLAND_API REDLAND_API
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 lines changed or added


 rdf_utf8.h   rdf_utf8.h 
skipping to change at line 47 skipping to change at line 47
* Unicode codepoint. * Unicode codepoint.
* *
*/ */
typedef raptor_unichar librdf_unichar; typedef raptor_unichar librdf_unichar;
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
int librdf_unicode_char_to_utf8(librdf_unichar c, unsigned char *output, in t length); int librdf_unicode_char_to_utf8(librdf_unichar c, unsigned char *output, in t length);
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
int librdf_utf8_to_unicode_char(librdf_unichar *output, const unsigned char *input, int length); int librdf_utf8_to_unicode_char(librdf_unichar *output, const unsigned char *input, int length);
REDLAND_API REDLAND_API
unsigned char* librdf_utf8_to_latin1(const unsigned char *input, int length , int *output_length); unsigned char* librdf_latin1_to_utf8_2(const unsigned char *input, size_t l ength, size_t *output_length);
REDLAND_API REDLAND_API
unsigned char* librdf_utf8_to_latin1_2(const unsigned char *input, size_t l
ength, unsigned char discard, size_t *output_length);
REDLAND_API REDLAND_DEPRECATED
unsigned char* librdf_utf8_to_latin1(const unsigned char *input, int length
, int *output_length);
REDLAND_API REDLAND_DEPRECATED
unsigned char* librdf_latin1_to_utf8(const unsigned char *input, int length , int *output_length); unsigned char* librdf_latin1_to_utf8(const unsigned char *input, int length , int *output_length);
REDLAND_API REDLAND_API
void librdf_utf8_print(const unsigned char *input, int length, FILE *stream ); void librdf_utf8_print(const unsigned char *input, int length, FILE *stream );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 7 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/