diff options
| author | Martyn Russell <martyn@lanedo.com> | 2010-01-07 13:32:41 +0000 |
|---|---|---|
| committer | Martyn Russell <martyn@lanedo.com> | 2010-01-07 13:56:17 +0000 |
| commit | 8a37e2f57fc8d918f5f4dcfa48c1bc24bf5bc314 (patch) | |
| tree | 3f751a2db24378a1308b7e2cb31e26dc538f6b43 | |
| parent | 705ce8361c8b30e14cb7fcb732502c324977fbd2 (diff) | |
| download | tracker-8a37e2f57fc8d918f5f4dcfa48c1bc24bf5bc314.tar.gz | |
Fix msword.h and don't wrap libtracker-common/tracker-utils.h for c++
| -rw-r--r-- | src/tracker-extract/tracker-msword.cpp | 4 | ||||
| -rw-r--r-- | src/tracker-extract/tracker-msword.h | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/tracker-extract/tracker-msword.cpp b/src/tracker-extract/tracker-msword.cpp index 943e8331e..e8a8a3dc7 100644 --- a/src/tracker-extract/tracker-msword.cpp +++ b/src/tracker-extract/tracker-msword.cpp @@ -31,11 +31,7 @@ #include <wv2/word97_generated.h> #include <wv2/ustring.h> - -extern "C" { #include <libtracker-common/tracker-utils.h> -} - using namespace wvWare; diff --git a/src/tracker-extract/tracker-msword.h b/src/tracker-extract/tracker-msword.h index 3a8ab88ef..2128da6b4 100644 --- a/src/tracker-extract/tracker-msword.h +++ b/src/tracker-extract/tracker-msword.h @@ -22,9 +22,11 @@ #include <glib.h> -#ifdef __cplusplus -extern "C" -#endif -gchar* extract_msword_content (const gchar *uri, gint max_words); +G_BEGIN_DECLS + +gchar* extract_msword_content (const gchar *uri, + gint max_words); + +G_END_DECLS #endif /* __TRACKERD_MSWORD_H__ */ |