From 80a902981843f3579fcb36d4123c5f00d42ce6d4 Mon Sep 17 00:00:00 2001 From: Alberto Bertogli Date: Sun, 29 Mar 2009 01:15:46 -0300 Subject: [PATCH 32/32] libjio.h: Remove C++ considerations In C++ source, doing the 'extern "C"' is a responsibility of the importer, it has nothing to do inside our C header. This reverts commit b903b5e. Signed-off-by: Alberto Bertogli --- UPGRADING | 2 ++ libjio/libjio.h | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/UPGRADING b/UPGRADING index 0d579e3..e5a4201 100644 --- a/UPGRADING +++ b/UPGRADING @@ -10,6 +10,8 @@ take much effort. When it's mandatory, it will be noted. -> 0.25 - It is no longer necessary to pass O_SYNC to jopen() if lingering transactions are not in use. + - libjio.h can no longer be included from C++ source without surrounding it + by an 'extern "C"'. This obviously should only affect C++ applications. -> 0.24 - The return values of jfsck() have changed, so applications using it need diff --git a/libjio/libjio.h b/libjio/libjio.h index 0d61c55..b092a48 100644 --- a/libjio/libjio.h +++ b/libjio/libjio.h @@ -23,10 +23,6 @@ #error "You must compile your application with Large File Support" #endif -#ifdef __cplusplus -extern "C" { -#endif - /* logical structures */ @@ -166,9 +162,5 @@ FILE *jfsopen(struct jfs *stream, const char *mode); #define J_ENOMEM -3 /* no enough free memory */ -#ifdef __cplusplus -} /* from extern "C" above */ -#endif - #endif -- 1.6.2.rc0.226.gf08f