[beast] SFI: compile sfitime as C++ source



commit 500f1ecd844874f83409e7aeb7c3282991e5612e
Author: Tim Janik <timj gtk org>
Date:   Mon May 9 04:01:52 2011 +0200

    SFI: compile sfitime as C++ source

 sfi/Makefile.am               |    2 +-
 sfi/{sfitime.c => sfitime.cc} |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index c3fbf08..db97940 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -22,7 +22,7 @@ sfi_all_sources = $(strip \
 	glib-extra.c			sfiwrapper.cc	sfiprimitives.cc \
 	sfivmarshal.c	sfiglue.c	sfigluecodec.c	sfiglueproxy.c	\
 	sfinote.c	sfiparams.c			sfiserial.c	\
-	sfitime.c	sfitypes.c	sfivalues.c	sfiustore.c	\
+	sfitime.cc	sfitypes.c	sfivalues.c	sfiustore.c	\
 	sficxx.cc	sfiring.cc	sfimemory.cc	sficomport.cc	\
 	$(conditional_toyprof_sources)	\
 )
diff --git a/sfi/sfitime.c b/sfi/sfitime.cc
similarity index 99%
rename from sfi/sfitime.c
rename to sfi/sfitime.cc
index f87d4d6..6adbebd 100644
--- a/sfi/sfitime.c
+++ b/sfi/sfitime.cc
@@ -643,7 +643,7 @@ sfi_time_from_string_err (const gchar *time_string,
 	  ustime = SFI_MIN_TIME;
 	}
     }
-  
+
   /* general cleanup and error return */
   g_free (string);
   if (error_p && warnings)
@@ -653,7 +653,7 @@ sfi_time_from_string_err (const gchar *time_string,
 	{
 	  if (gstring->len)
 	    g_string_append (gstring, ", ");
-	  g_string_append (gstring, ring->data);
+	  g_string_append (gstring, (char*) ring->data);
 	}
       g_string_aprintf (gstring, " in date: \"%s\"", time_string);
       *error_p = g_string_free (gstring, FALSE);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]