[seed] Fix some 'duplicate symbol' errors on other platforms
- From: Tim Horton <hortont src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [seed] Fix some 'duplicate symbol' errors on other platforms
- Date: Fri, 1 Jan 2010 22:26:19 +0000 (UTC)
commit 8f6301aa559216ac8f2c86064e1d674b9dbd650a
Author: Tim Horton <hortont424 gmail com>
Date: Fri Jan 1 17:23:16 2010 -0500
Fix some 'duplicate symbol' errors on other platforms
libseed/seed-engine.c | 2 ++
libseed/seed-engine.h | 2 +-
modules/mpfr/seed-mpfr.c | 3 +++
modules/mpfr/seed-mpfr.h | 4 ++--
4 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/libseed/seed-engine.c b/libseed/seed-engine.c
index 4c61eb2..23e28ff 100644
--- a/libseed/seed-engine.c
+++ b/libseed/seed-engine.c
@@ -41,6 +41,8 @@ JSClassRef seed_struct_constructor_class;
JSContextGroupRef context_group;
+JSStringRef defaults_script;
+
gchar *glib_message = 0;
GIBaseInfo *base_info_info = 0;
diff --git a/libseed/seed-engine.h b/libseed/seed-engine.h
index ce7dcea..c053ab8 100644
--- a/libseed/seed-engine.h
+++ b/libseed/seed-engine.h
@@ -38,7 +38,7 @@ extern JSObjectRef seed_obj_ref;
extern JSContextGroupRef context_group;
-JSStringRef defaults_script;
+extern JSStringRef defaults_script;
typedef struct _SeedScript
{
diff --git a/modules/mpfr/seed-mpfr.c b/modules/mpfr/seed-mpfr.c
index 607e0ea..3333117 100644
--- a/modules/mpfr/seed-mpfr.c
+++ b/modules/mpfr/seed-mpfr.c
@@ -24,6 +24,9 @@
#include "seed-mpfr.h"
+SeedObject ns_ref;
+SeedClass mpfr_class;
+
/* For now at least ignoring the ability to use gmp types since there is no gmp module */
SeedEngine * eng;
diff --git a/modules/mpfr/seed-mpfr.h b/modules/mpfr/seed-mpfr.h
index 4793287..35ed94c 100644
--- a/modules/mpfr/seed-mpfr.h
+++ b/modules/mpfr/seed-mpfr.h
@@ -41,8 +41,8 @@
#define DEF_SEED_MPFR_FUNC(name) SeedValue name( SeedContext,SeedObject,\
SeedObject, gsize, const SeedValue[], SeedException*)
-SeedObject ns_ref;
-SeedClass mpfr_class;
+extern SeedObject ns_ref;
+extern SeedClass mpfr_class;
typedef enum _seed_mpfr_t
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]