1.1 --- a/naspro-bridges-bad/dssi/pluglib.c	Fri Sep 11 19:15:15 2009 +0200
     1.2 +++ b/naspro-bridges-bad/dssi/pluglib.c	Sat Sep 12 18:43:25 2009 +0200
     1.3 @@ -18,7 +18,6 @@
     1.4  
     1.5  #include "pluglib.h"
     1.6  #include "descriptor.h"
     1.7 -#include "lrdf.h"
     1.8  
     1.9  nacore_avl_tree_t _nadssi_pluglib_desc_tree = NULL;
    1.10  

     2.1 --- a/naspro-core/include/NASPRO/core/avl.h	Fri Sep 11 19:15:15 2009 +0200
     2.2 +++ b/naspro-core/include/NASPRO/core/avl.h	Sat Sep 12 18:43:25 2009 +0200
     2.3 @@ -12,6 +12,10 @@
     2.4  
     2.5  #include <stdlib.h>
     2.6  
     2.7 +#ifdef __cplusplus
     2.8 +extern "C" {
     2.9 +#endif
    2.10 +
    2.11  typedef struct _nacore_avl_tree * nacore_avl_tree_t;
    2.12  
    2.13  nacore_avl_tree_t nacore_avl_tree_new(int (*content_cmp)(void *c1, void *c2),
    2.14 @@ -27,4 +31,8 @@
    2.15  int nacore_content_cmp_descriptor_by_uri(void *c1, void *c2);
    2.16  int nacore_key_cmp_descriptor_by_uri(void *content, void *data);
    2.17  
    2.18 +#ifdef __cplusplus
    2.19 +}
    2.20 +#endif
    2.21 +
    2.22  #endif /* !_NACORE_AVL_H */

     3.1 --- a/naspro-core/include/NASPRO/core/env.h	Fri Sep 11 19:15:15 2009 +0200
     3.2 +++ b/naspro-core/include/NASPRO/core/env.h	Sat Sep 12 18:43:25 2009 +0200
     3.3 @@ -10,7 +10,15 @@
     3.4  #ifndef _NACORE_ENV_H
     3.5  #define _NACORE_ENV_H
     3.6  
     3.7 +#ifdef __cplusplus
     3.8 +extern "C" {
     3.9 +#endif
    3.10 +
    3.11  char * nacore_env_get_var(const char *name);
    3.12  void nacore_env_free_var_value(char *value);
    3.13  
    3.14 +#ifdef __cplusplus
    3.15 +}
    3.16 +#endif
    3.17 +
    3.18  #endif /* !_NACORE_ENV_H */

     4.1 --- a/naspro-core/include/NASPRO/core/lv2api.h	Fri Sep 11 19:15:15 2009 +0200
     4.2 +++ b/naspro-core/include/NASPRO/core/lv2api.h	Sat Sep 12 18:43:25 2009 +0200
     4.3 @@ -14,7 +14,15 @@
     4.4  
     4.5  #include <NASPRO/core/bridge.h>
     4.6  
     4.7 +#ifdef __cplusplus
     4.8 +extern "C" {
     4.9 +#endif
    4.10 +
    4.11  void nacore_lv2api_fill_desc(LV2_Descriptor *lv2_desc,
    4.12  			     struct nacore_descriptor *n_desc);
    4.13  
    4.14 +#ifdef __cplusplus
    4.15 +}
    4.16 +#endif
    4.17 +
    4.18  #endif /* !_NACORE_LV2API_H */

     5.1 --- a/naspro-core/include/NASPRO/core/manifest.h	Fri Sep 11 19:15:15 2009 +0200
     5.2 +++ b/naspro-core/include/NASPRO/core/manifest.h	Sat Sep 12 18:43:25 2009 +0200
     5.3 @@ -12,10 +12,18 @@
     5.4  
     5.5  #include <stdio.h>
     5.6  
     5.7 +#ifdef __cplusplus
     5.8 +extern "C" {
     5.9 +#endif
    5.10 +
    5.11  void nacore_manifest_print_subject_prefixes(FILE *fp);
    5.12  void nacore_manifest_print_subject_triple(struct nacore_descriptor *desc,
    5.13  					  FILE *fp);
    5.14  void nacore_manifest_print_data(struct nacore_descriptor *desc, FILE *fp,
    5.15  				const char *binary);
    5.16  
    5.17 +#ifdef __cplusplus
    5.18 +}
    5.19 +#endif
    5.20 +
    5.21  #endif /* !_NACORE_MANIFEST_H */