librdf.h   librdf.h 
skipping to change at line 30 skipping to change at line 30
* 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_H #ifndef LIBRDF_H
#define LIBRDF_H #define LIBRDF_H
#ifndef LIBRDF_OBJC_FRAMEWORK #ifndef LIBRDF_OBJC_FRAMEWORK
/* raptor */ /* raptor */
#include <raptor.h> #include <raptor2.h>
/* rasqal: uses raptor */ /* rasqal: uses raptor */
#include <rasqal.h> #include <rasqal.h>
/* librdf: uses rasqal and raptor */ /* librdf: uses rasqal and raptor */
#else #else
#include <Redland/raptor.h> #include <Redland/raptor2.h>
#include <Redland/rasqal.h> #include <Redland/rasqal.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <stdio.h> #include <stdio.h>
#ifndef REDLAND_API #ifndef REDLAND_API
skipping to change at line 98 skipping to change at line 98
/* 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 10013 #define LIBRDF_VERSION 10015
/** /**
* LIBRDF_VERSION_STRING: * LIBRDF_VERSION_STRING:
* *
* Redland librdf library version string * Redland librdf library version string
*/ */
#define LIBRDF_VERSION_STRING "1.0.13" #define LIBRDF_VERSION_STRING "1.0.15"
/** /**
* 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 13 #define LIBRDF_VERSION_RELEASE 15
/* 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 292 skipping to change at line 292
typedef struct librdf_serializer_s librdf_serializer; typedef struct librdf_serializer_s librdf_serializer;
/** /**
* librdf_serializer_factory: * librdf_serializer_factory:
* *
* Redland serializer factory class. * Redland serializer factory class.
*/ */
typedef struct librdf_serializer_factory_s librdf_serializer_factory; typedef struct librdf_serializer_factory_s librdf_serializer_factory;
/* Public statics */ /* Public statics */
/**
* librdf_short_copyright_string:
*
* Short copyright string (one line).
*/
REDLAND_API REDLAND_API
extern const char * const librdf_short_copyright_string; extern const char * const librdf_short_copyright_string;
/**
* librdf_copyright_string:
*
* 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:
*
* Raptor 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:
*
* Raptor major version number.
*/
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_major; extern const unsigned int librdf_version_major;
/**
* librdf_version_minor:
*
* Raptor minor version number.
*/
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_minor; extern const unsigned int librdf_version_minor;
/**
* librdf_version_release:
*
* Rasqal release version number.
*/
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_release; extern const unsigned int librdf_version_release;
/**
* librdf_version_decimal:
*
* Rasqal version as a decimal number.
*
* Format: major * 10000 + minor * 100 + release
*/
REDLAND_API REDLAND_API
extern const unsigned int librdf_version_decimal; extern const unsigned int librdf_version_decimal;
/* 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
skipping to change at line 340 skipping to change at line 384
#include <rdf_node.h> #include <rdf_node.h>
#include <rdf_concepts.h> #include <rdf_concepts.h>
#include <rdf_statement.h> #include <rdf_statement.h>
#include <rdf_model.h> #include <rdf_model.h>
#include <rdf_storage.h> #include <rdf_storage.h>
#include <rdf_parser.h> #include <rdf_parser.h>
#include <rdf_raptor.h> #include <rdf_raptor.h>
#include <rdf_serializer.h> #include <rdf_serializer.h>
#include <rdf_stream.h> #include <rdf_stream.h>
#include <rdf_query.h> #include <rdf_query.h>
#include <rdf_utf8.h>
#else #else
#include <Redland/rdf_log.h> #include <Redland/rdf_log.h>
#include <Redland/rdf_digest.h> #include <Redland/rdf_digest.h>
#include <Redland/rdf_hash.h> #include <Redland/rdf_hash.h>
#include <Redland/rdf_init.h> #include <Redland/rdf_init.h>
#include <Redland/rdf_iterator.h> #include <Redland/rdf_iterator.h>
#include <Redland/rdf_uri.h> #include <Redland/rdf_uri.h>
#include <Redland/rdf_node.h> #include <Redland/rdf_node.h>
#include <Redland/rdf_concepts.h> #include <Redland/rdf_concepts.h>
#include <Redland/rdf_statement.h> #include <Redland/rdf_statement.h>
#include <Redland/rdf_model.h> #include <Redland/rdf_model.h>
#include <Redland/rdf_storage.h> #include <Redland/rdf_storage.h>
#include <Redland/rdf_parser.h> #include <Redland/rdf_parser.h>
#include <Redland/rdf_raptor.h> #include <Redland/rdf_raptor.h>
#include <Redland/rdf_serializer.h> #include <Redland/rdf_serializer.h>
#include <Redland/rdf_stream.h> #include <Redland/rdf_stream.h>
#include <Redland/rdf_query.h> #include <Redland/rdf_query.h>
#include <Redland/rdf_utf8.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 14 change blocks. 
5 lines changed or deleted 51 lines changed or added


 rdf_hash.h   rdf_hash.h 
skipping to change at line 38 skipping to change at line 38
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_hash_internal.h> #include <rdf_hash_internal.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* public constructors */ /* public constructors */
REDLAND_API REDLAND_API
librdf_hash* librdf_new_hash(librdf_world *world, const char *name);
REDLAND_API
librdf_hash* librdf_new_hash_from_string(librdf_world *world, const char *n ame, const char *string); librdf_hash* librdf_new_hash_from_string(librdf_world *world, const char *n ame, const char *string);
REDLAND_API REDLAND_API
librdf_hash* librdf_new_hash_from_array_of_strings(librdf_world *world, con st char *name, const char **array); librdf_hash* librdf_new_hash_from_array_of_strings(librdf_world *world, con st char *name, const char **array);
/* public copy constructor */ /* public copy constructor */
REDLAND_API REDLAND_API
librdf_hash* librdf_new_hash_from_hash (librdf_hash* old_hash); librdf_hash* librdf_new_hash_from_hash (librdf_hash* old_hash);
/* public destructor */ /* public destructor */
REDLAND_API REDLAND_API
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 rdf_init.h   rdf_init.h 
/* -*- Mode: c; c-basic-offset: 2 -*- /* -*- Mode: c; c-basic-offset: 2 -*-
* *
* rdf_init.h - Overall library initialisation / termination prototypes * rdf_init.h - Overall library initialisation / termination and memory
* management prototypes
* *
* Copyright (C) 2000-2008, David Beckett http://www.dajobe.org/ * Copyright (C) 2000-2008, David Beckett http://www.dajobe.org/
* Copyright (C) 2000-2004, University of Bristol, UK http://www.bristol.ac .uk/ * Copyright (C) 2000-2004, University of Bristol, UK http://www.bristol.ac .uk/
* *
* This package is Free Software and part of Redland http://librdf.org/ * This package is Free Software and part of Redland http://librdf.org/
* *
* It is licensed under the following three licenses as alternatives: * It is licensed under the following three licenses as alternatives:
* 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version * 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version
* 2. GNU General Public License (GPL) V2 or any newer version * 2. GNU General Public License (GPL) V2 or any newer version
* 3. Apache License, V2.0 or any newer version * 3. Apache License, V2.0 or any newer version
skipping to change at line 68 skipping to change at line 69
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
void librdf_world_set_digest(librdf_world* world, const char *name); void librdf_world_set_digest(librdf_world* world, const char *name);
REDLAND_API
void librdf_free_memory(void *ptr);
REDLAND_API
void* librdf_alloc_memory(size_t size);
REDLAND_API
void* librdf_calloc_memory(size_t nmemb, size_t size);
/** /**
* LIBRDF_WORLD_FEATURE_GENID_BASE: * LIBRDF_WORLD_FEATURE_GENID_BASE:
* *
* World feature to set the generated ID base. * World feature to set the generated ID base.
* *
* Must be set before the world is opened with librdf_world_open(). * Must be set before the world is opened with librdf_world_open().
*/ */
#define LIBRDF_WORLD_FEATURE_GENID_BASE "http://feature.librdf.org/genid-ba se" #define LIBRDF_WORLD_FEATURE_GENID_BASE "http://feature.librdf.org/genid-ba se"
/** /**
 End of changes. 2 change blocks. 
1 lines changed or deleted 9 lines changed or added


 rdf_log.h   rdf_log.h 
skipping to change at line 32 skipping to change at line 32
* *
*/ */
#ifndef LIBRDF_LOG_H #ifndef LIBRDF_LOG_H
#define LIBRDF_LOG_H #define LIBRDF_LOG_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <raptor.h> #include <raptor2.h>
/** /**
* librdf_log_level: * librdf_log_level:
* @LIBRDF_LOG_NONE: No level * @LIBRDF_LOG_NONE: No level
* @LIBRDF_LOG_DEBUG: Debug. * @LIBRDF_LOG_DEBUG: Debug.
* @LIBRDF_LOG_INFO: Information. * @LIBRDF_LOG_INFO: Information.
* @LIBRDF_LOG_WARN: Warning. * @LIBRDF_LOG_WARN: Warning.
* @LIBRDF_LOG_ERROR: Recoverable error. Program can continue. * @LIBRDF_LOG_ERROR: Recoverable error. Program can continue.
* @LIBRDF_LOG_FATAL: Fatal error. Program will abort if this is not caugh t. * @LIBRDF_LOG_FATAL: Fatal error. Program will abort if this is not caugh t.
* @LIBRDF_LOG_LAST: Internal, never returned. * @LIBRDF_LOG_LAST: Internal, never returned.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 rdf_parser.h   rdf_parser.h 
skipping to change at line 67 skipping to change at line 67
/* methods */ /* methods */
REDLAND_API REDLAND_API
librdf_stream* librdf_parser_parse_as_stream(librdf_parser* parser, librdf_ uri* uri, librdf_uri* base_uri); librdf_stream* librdf_parser_parse_as_stream(librdf_parser* parser, librdf_ uri* uri, librdf_uri* base_uri);
REDLAND_API REDLAND_API
int librdf_parser_parse_into_model(librdf_parser* parser, librdf_uri* uri, librdf_uri* base_uri, librdf_model* model); int librdf_parser_parse_into_model(librdf_parser* parser, librdf_uri* uri, librdf_uri* base_uri, librdf_model* model);
REDLAND_API REDLAND_API
librdf_stream* librdf_parser_parse_string_as_stream(librdf_parser* parser, const unsigned char* string, librdf_uri* base_uri); librdf_stream* librdf_parser_parse_string_as_stream(librdf_parser* parser, const unsigned char* string, librdf_uri* base_uri);
REDLAND_API REDLAND_API
int librdf_parser_parse_string_into_model(librdf_parser* parser, const unsi gned char *string, librdf_uri* base_uri, librdf_model* model); int librdf_parser_parse_string_into_model(librdf_parser* parser, const unsi gned char *string, librdf_uri* base_uri, librdf_model* model);
REDLAND_API REDLAND_API
librdf_stream* librdf_parser_parse_iostream_as_stream(librdf_parser* parser
, raptor_iostream *iostream, librdf_uri* base_uri);
REDLAND_API
int librdf_parser_parse_iostream_into_model(librdf_parser* parser, raptor_i
ostream *iostream, librdf_uri* base_uri, librdf_model* model);
REDLAND_API
librdf_stream* librdf_parser_parse_file_handle_as_stream(librdf_parser* par ser, FILE* fh, int close_fh, librdf_uri* base_uri); librdf_stream* librdf_parser_parse_file_handle_as_stream(librdf_parser* par ser, FILE* fh, int close_fh, librdf_uri* base_uri);
REDLAND_API REDLAND_API
int librdf_parser_parse_file_handle_into_model(librdf_parser* parser, FILE *fh, int close_fh, librdf_uri* base_uri, librdf_model* model); int librdf_parser_parse_file_handle_into_model(librdf_parser* parser, FILE *fh, int close_fh, librdf_uri* base_uri, librdf_model* model);
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
void librdf_parser_set_error(librdf_parser* parser, void *user_data, void ( *error_fn)(void *user_data, const char *msg, ...)); void librdf_parser_set_error(librdf_parser* parser, void *user_data, void ( *error_fn)(void *user_data, const char *msg, ...));
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
void librdf_parser_set_warning(librdf_parser* parser, void *user_data, void (*warning_fn)(void *user_data, const char *msg, ...)); void librdf_parser_set_warning(librdf_parser* parser, void *user_data, void (*warning_fn)(void *user_data, const char *msg, ...));
REDLAND_API REDLAND_API
librdf_stream* librdf_parser_parse_counted_string_as_stream(librdf_parser* parser, const unsigned char *string, size_t length, librdf_uri* base_uri); librdf_stream* librdf_parser_parse_counted_string_as_stream(librdf_parser* parser, const unsigned char *string, size_t length, librdf_uri* base_uri);
REDLAND_API REDLAND_API
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 rdf_query.h   rdf_query.h 
skipping to change at line 39 skipping to change at line 39
#include <rdf_query_internal.h> #include <rdf_query_internal.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* class methods */ /* class methods */
REDLAND_API REDLAND_API
void librdf_query_register_factory(librdf_world *world, const char *name, c onst unsigned char *uri_string, void (*factory) (librdf_query_factory*)); void librdf_query_register_factory(librdf_world *world, const char *name, c onst unsigned char *uri_string, void (*factory) (librdf_query_factory*));
REDLAND_API REDLAND_API REDLAND_DEPRECATED
int librdf_query_languages_enumerate(librdf_world* world, const unsigned in t counter, const char **name, const unsigned char **uri_string); int librdf_query_languages_enumerate(librdf_world* world, const unsigned in t counter, const char **name, const unsigned char **uri_string);
REDLAND_API
const raptor_syntax_description* librdf_query_language_get_description(libr
df_world* world, unsigned int counter);
/* constructor */ /* constructor */
REDLAND_API REDLAND_API
librdf_query* librdf_new_query(librdf_world* world, const char *name, librd f_uri* uri, const unsigned char *query_string, librdf_uri* base_uri); librdf_query* librdf_new_query(librdf_world* world, const char *name, librd f_uri* uri, const unsigned char *query_string, librdf_uri* base_uri);
REDLAND_API REDLAND_API
librdf_query* librdf_new_query_from_query (librdf_query* old_query); librdf_query* librdf_new_query_from_query (librdf_query* old_query);
REDLAND_API REDLAND_API
librdf_query* librdf_new_query_from_factory(librdf_world* world, librdf_que ry_factory* factory, const char *name, librdf_uri* uri, const unsigned char * query_string, librdf_uri* base_uri); librdf_query* librdf_new_query_from_factory(librdf_world* world, librdf_que ry_factory* factory, const char *name, librdf_uri* uri, const unsigned char * query_string, librdf_uri* base_uri);
/* destructor */ /* destructor */
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 rdf_serializer.h   rdf_serializer.h 
skipping to change at line 36 skipping to change at line 36
#define LIBRDF_SERIALIZER_H #define LIBRDF_SERIALIZER_H
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_serializer_internal.h> #include <rdf_serializer_internal.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <raptor.h> #include <raptor2.h>
/* class methods */ /* class methods */
REDLAND_API REDLAND_API
void librdf_serializer_register_factory(librdf_world *world, const char *na me, const char *label, const char *mime_type, const unsigned char *uri_stri ng, void (*factory) (librdf_serializer_factory*)); void librdf_serializer_register_factory(librdf_world *world, const char *na me, const char *label, const char *mime_type, const unsigned char *uri_stri ng, void (*factory) (librdf_serializer_factory*));
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
int librdf_serializer_enumerate(librdf_world* world, const unsigned int cou nter, const char **name, const char **label); int librdf_serializer_enumerate(librdf_world* world, const unsigned int cou nter, const char **name, const char **label);
REDLAND_API REDLAND_API
const raptor_syntax_description* librdf_serializer_get_description(librdf_w orld* world, unsigned int counter); const raptor_syntax_description* librdf_serializer_get_description(librdf_w orld* world, unsigned int counter);
REDLAND_API REDLAND_API
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 rdf_statement.h   rdf_statement.h 
skipping to change at line 66 skipping to change at line 66
LIBRDF_STATEMENT_PREDICATE| LIBRDF_STATEMENT_PREDICATE|
LIBRDF_STATEMENT_OBJECT) LIBRDF_STATEMENT_OBJECT)
} librdf_statement_part; } librdf_statement_part;
/* initialising functions / constructors */ /* initialising functions / constructors */
/* Create a new Statement. */ /* Create a new Statement. */
REDLAND_API REDLAND_API
librdf_statement* librdf_new_statement(librdf_world* world); librdf_statement* librdf_new_statement(librdf_world* world);
/* Create a new Statement from an existing Statement - CLONE */ /* Create a new Statement from an existing Statement - DEEP CLONE */
REDLAND_API REDLAND_API
librdf_statement* librdf_new_statement_from_statement(librdf_statement* sta tement); librdf_statement* librdf_new_statement_from_statement(librdf_statement* sta tement);
/* Create a new Statement from an existing Statement - SHALLOW CLONE */
REDLAND_API
librdf_statement* librdf_new_statement_from_statement2(librdf_statement* st
atement);
/* Create a new Statement from existing Nodes */ /* Create a new Statement from existing Nodes */
REDLAND_API REDLAND_API
librdf_statement* librdf_new_statement_from_nodes(librdf_world *world, libr df_node* subject, librdf_node* predicate, librdf_node* object); librdf_statement* librdf_new_statement_from_nodes(librdf_world *world, libr df_node* subject, librdf_node* predicate, librdf_node* object);
/* Init a statically allocated statement */ /* Init a statically allocated statement */
REDLAND_API REDLAND_API
void librdf_statement_init(librdf_world *world, librdf_statement *statement ); void librdf_statement_init(librdf_world *world, librdf_statement *statement );
/* Clear a statically allocated statement */ /* Clear a statically allocated statement */
REDLAND_API REDLAND_API
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 rdf_types.h   rdf_types.h 
skipping to change at line 37 skipping to change at line 37
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#ifndef HAVE_U64 #ifndef HAVE_U64
#if SIZEOF_UNSIGNED_INT == 8 #if SIZEOF_UNSIGNED_INT == 8
typedef unsigned int u64; typedef unsigned int u64;
#define UINT64_T_FMT "%u"
#elif SIZEOF_UNSIGNED_LONG == 8 #elif SIZEOF_UNSIGNED_LONG == 8
typedef unsigned long u64; typedef unsigned long u64;
#define UINT64_T_FMT "%lu"
#elif SIZEOF_UNSIGNED_LONG_LONG == 8 #elif SIZEOF_UNSIGNED_LONG_LONG == 8
#ifdef WIN32 #ifdef WIN32
typedef __int64 u64; typedef __int64 u64;
#define UINT64_T_FMT "%I64u"
#else #else
typedef unsigned long long u64; typedef unsigned long long u64;
#define UINT64_T_FMT "%llu"
#endif #endif
#else #else
#error u64 type not defined #error u64 type not defined
#endif #endif
#endif #endif
#ifndef HAVE_U32 #ifndef HAVE_U32
#if SIZEOF_UNSIGNED_INT == 4 #if SIZEOF_UNSIGNED_INT == 4
typedef unsigned int u32; typedef unsigned int u32;
#elif SIZEOF_UNSIGNED_LONG == 4 #elif SIZEOF_UNSIGNED_LONG == 4
skipping to change at line 68 skipping to change at line 72
#endif #endif
#ifndef HAVE_BYTE #ifndef HAVE_BYTE
#if SIZEOF_UNSIGNED_CHAR == 1 #if SIZEOF_UNSIGNED_CHAR == 1
typedef unsigned char byte; typedef unsigned char byte;
#else #else
#error byte type not defined #error byte type not defined
#endif #endif
#endif #endif
#ifdef WIN32
#define UINT64_T_FMT "%I64u"
#else
#define UINT64_T_FMT "%llu"
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 5 change blocks. 
7 lines changed or deleted 5 lines changed or added


 rdf_utf8.h   rdf_utf8.h 
skipping to change at line 32 skipping to change at line 32
* *
*/ */
#ifndef LIBRDF_UTF8_H #ifndef LIBRDF_UTF8_H
#define LIBRDF_UTF8_H #define LIBRDF_UTF8_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef LIBRDF_OBJC_FRAMEWORK #include <raptor2.h>
#include <rdf_types.h>
#else
#include <Redland/rdf_types.h>
#endif
/** /**
* librdf_unichar: * librdf_unichar:
* *
* Unicode codepoint. * Unicode codepoint.
* *
*/ */
typedef u32 librdf_unichar; typedef raptor_unichar librdf_unichar;
int librdf_unicode_char_to_utf8(librdf_unichar c, byte *output, int length) REDLAND_API REDLAND_DEPRECATED
; int librdf_unicode_char_to_utf8(librdf_unichar c, unsigned char *output, in
int librdf_utf8_to_unicode_char(librdf_unichar *output, const byte *input, t length);
int length); REDLAND_API REDLAND_DEPRECATED
byte* librdf_utf8_to_latin1(const byte *input, int length, int *output_leng int librdf_utf8_to_unicode_char(librdf_unichar *output, const unsigned char
th); *input, int length);
byte* librdf_latin1_to_utf8(const byte *input, int length, int *output_leng REDLAND_API
th); unsigned char* librdf_utf8_to_latin1(const unsigned char *input, int length
void librdf_utf8_print(const byte *input, int length, FILE *stream); , int *output_length);
REDLAND_API
unsigned char* librdf_latin1_to_utf8(const unsigned char *input, int length
, int *output_length);
REDLAND_API
void librdf_utf8_print(const unsigned char *input, int length, FILE *stream
);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 3 change blocks. 
15 lines changed or deleted 17 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/