librdf.h   librdf.h 
/* -*- Mode: c; c-basic-offset: 2 -*- /* -*- Mode: c; c-basic-offset: 2 -*-
* *
* redland.h - Redland RDF Application Framework public API * redland.h - Redland RDF Application Framework public API
* *
* Copyright (C) 2000-2008, David Beckett http://www.dajobe.org/ * Copyright (C) 2000-2010, David Beckett http://www.dajobe.org/
* Copyright (C) 2000-2005, University of Bristol, UK http://www.bristol.ac .uk/ * Copyright (C) 2000-2005, 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
* *
* You may not use this file except in compliance with at least one of * You may not use this file except in compliance with at least one of
skipping to change at line 28 skipping to change at line 28
* 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_H #ifndef LIBRDF_H
#define LIBRDF_H #define LIBRDF_H
#ifndef LIBRDF_OBJC_FRAMEWORK
/* raptor */
#include <raptor.h>
/* rasqal: uses raptor */
#include <rasqal.h>
/* librdf: uses rasqal and raptor */
#else
#include <Redland/raptor.h>
#include <Redland/rasqal.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <stdio.h> #include <stdio.h>
#ifndef REDLAND_API #ifndef REDLAND_API
# ifdef WIN32 # ifdef WIN32
# ifdef __GNUC__ # ifdef __GNUC__
# undef _declspec # undef _declspec
skipping to change at line 66 skipping to change at line 77
# define REDLAND_CALLBACK_STDCALL _stdcall # define REDLAND_CALLBACK_STDCALL _stdcall
# 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
#ifdef __APPLE_CC__
/* OSX gcc cpp-precomp is broken */
#define REDLAND_DEPRECATED
#else
#define REDLAND_DEPRECATED __attribute__((deprecated)) #define REDLAND_DEPRECATED __attribute__((deprecated))
#endif
#else #else
#define REDLAND_DEPRECATED #define REDLAND_DEPRECATED
#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
 End of changes. 4 change blocks. 
6 lines changed or deleted 12 lines changed or added


 rdf_init.h   rdf_init.h 
skipping to change at line 32 skipping to change at line 32
* *
*/ */
#ifndef LIBRDF_INIT_H #ifndef LIBRDF_INIT_H
#define LIBRDF_INIT_H #define LIBRDF_INIT_H
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_init_internal.h> #include <rdf_init_internal.h>
#endif #endif
#ifndef LIBRDF_OBJC_FRAMEWORK
#include <rasqal.h>
#else
#include <Redland/rasqal.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
REDLAND_API REDLAND_API
librdf_world* librdf_new_world(void); librdf_world* librdf_new_world(void);
REDLAND_API REDLAND_API
void librdf_free_world(librdf_world *world); void librdf_free_world(librdf_world *world);
REDLAND_API REDLAND_API
void librdf_world_open(librdf_world *world); void librdf_world_open(librdf_world *world);
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 rdf_stream.h   rdf_stream.h 
skipping to change at line 93 skipping to change at line 93
/* methods */ /* methods */
REDLAND_API REDLAND_API
int librdf_stream_end(librdf_stream* stream); int librdf_stream_end(librdf_stream* stream);
REDLAND_API REDLAND_API
int librdf_stream_next(librdf_stream* stream); int librdf_stream_next(librdf_stream* stream);
REDLAND_API REDLAND_API
librdf_statement* librdf_stream_get_object(librdf_stream* stream); librdf_statement* librdf_stream_get_object(librdf_stream* stream);
REDLAND_API REDLAND_API
librdf_node* librdf_stream_get_context2(librdf_stream* stream);
REDLAND_API REDLAND_DEPRECATED
void* librdf_stream_get_context(librdf_stream* stream); void* librdf_stream_get_context(librdf_stream* stream);
REDLAND_API REDLAND_API
int librdf_stream_add_map(librdf_stream* stream, librdf_stream_map_handler map_function, librdf_stream_map_free_context_handler free_context, void *ma p_context); int librdf_stream_add_map(librdf_stream* stream, librdf_stream_map_handler map_function, librdf_stream_map_free_context_handler free_context, void *ma p_context);
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
void librdf_stream_print(librdf_stream *stream, FILE *fh); void librdf_stream_print(librdf_stream *stream, FILE *fh);
REDLAND_API REDLAND_API
int librdf_stream_write(librdf_stream *stream, raptor_iostream *iostr); int librdf_stream_write(librdf_stream *stream, raptor_iostream *iostr);
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 redland.h   redland.h 
/* -*- Mode: c; c-basic-offset: 2 -*- /* -*- Mode: c; c-basic-offset: 2 -*-
* *
* redland.h - Redland RDF Application Framework main header * redland.h - Redland RDF Application Framework main header
* *
* Copyright (C) 2000-2008, David Beckett http://www.dajobe.org/ * Copyright (C) 2000-2010, 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
* *
* You may not use this file except in compliance with at least one of * You may not use this file except in compliance with at least one of
skipping to change at line 28 skipping to change at line 28
* 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 REDLAND_H #ifndef REDLAND_H
#define REDLAND_H #define REDLAND_H
#ifdef __cplusplus
extern "C" {
#endif
#ifndef LIBRDF_OBJC_FRAMEWORK #ifndef LIBRDF_OBJC_FRAMEWORK
/* Redland consists of */
/* raptor */
#include <raptor.h>
/* rasqal */
#include <rasqal.h>
/* librdf */
#include <librdf.h> #include <librdf.h>
#else #else
#include <Redland/raptor.h>
#include <Redland/rasqal.h>
#include <Redland/librdf.h> #include <Redland/librdf.h>
#endif #endif
#ifdef __cplusplus
}
#endif
#endif #endif
 End of changes. 5 change blocks. 
17 lines changed or deleted 1 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/