[gnumeric] Introspection: use goffice's boxed type.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Introspection: use goffice's boxed type.
- Date: Tue, 16 Feb 2016 16:25:18 +0000 (UTC)
commit 48c2709ce11e8ccec8d62898b844290cad0a09be
Author: Morten Welinder <terra gnome org>
Date: Tue Feb 16 11:24:51 2016 -0500
Introspection: use goffice's boxed type.
configure.ac | 2 +-
src/complex.c | 21 ---------------------
src/complex.h | 6 ++----
3 files changed, 3 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4568c9a..d77eb3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,7 @@ PKG_PROG_PKG_CONFIG(0.18)
dnl *****************************
libspreadsheet_reqs="
- libgoffice-${GOFFICE_API_VER} >= 0.10.27
+ libgoffice-${GOFFICE_API_VER} >= 0.10.28
libgsf-1 >= 1.14.33
libxml-2.0 >= 2.4.12
"
diff --git a/src/complex.c b/src/complex.c
index ca88221..b14ec1c 100644
--- a/src/complex.c
+++ b/src/complex.c
@@ -178,24 +178,3 @@ gnm_complex_invalid_p (gnm_complex const *src)
}
/* ------------------------------------------------------------------------- */
-
-static gnm_complex *
-dup_complex (gnm_complex *src)
-{
- return g_memdup (src, sizeof (*src));
-}
-
-GType
-gnm_complex_get_type (void)
-{
- static GType t = 0;
-
- if (t == 0)
- t = g_boxed_type_register_static
- ("gnm_complex",
- (GBoxedCopyFunc)dup_complex,
- (GBoxedFreeFunc)g_free);
- return t;
-}
-
-/* ------------------------------------------------------------------------- */
diff --git a/src/complex.h b/src/complex.h
index e9c1b0e..ee49e04 100644
--- a/src/complex.h
+++ b/src/complex.h
@@ -9,7 +9,7 @@
G_BEGIN_DECLS
#ifdef GNM_WITH_LONG_DOUBLE
-typedef GOComplexl gnm_complex;
+#define gnm_complex GOComplexl
#define gnm_complex_init go_complex_initl
#define gnm_complex_add go_complex_addl
#define gnm_complex_sub go_complex_subl
@@ -34,7 +34,7 @@ typedef GOComplexl gnm_complex;
#define gnm_complex_from_polar go_complex_from_polarl
#define gnm_complex_from_polar_pi go_complex_from_polar_pil
#else
-typedef GOComplex gnm_complex;
+#define gnm_complex GOComplex
#define gnm_complex_init go_complex_init
#define gnm_complex_add go_complex_add
#define gnm_complex_sub go_complex_sub
@@ -68,8 +68,6 @@ int gnm_complex_from_string (gnm_complex *dst, char const *src, char *imunit);
int gnm_complex_invalid_p (gnm_complex const *src);
-GType gnm_complex_get_type (void);
-
/* ------------------------------------------------------------------------- */
// Value interface
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]