[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_3-45-g4e6719a

[Gunee]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  4e6719a77934b960fdb3edc2bbdde16f0ea8c9b5 (commit)
      from  82524632a99f7057b1a5d35e96a8b9beb9e78269 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4e6719a77934b960fdb3edc2bbdde16f0ea8c9b5
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date:   Sun Sep 19 11:51:40 2010 +0200

    Fixed build problems and typos on Windows (MSVC)

-----------------------------------------------------------------------

Changes:
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 03c8a85..331c75b 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -226,6 +226,7 @@ static gint bet_array_date_sort_function ( GtkTreeModel *model,
     GValue date_value_b = {0,};
     GDate* date_a;
     GDate* date_b;
+    gint result;
 
     if ( itera == NULL )
         return -1;
@@ -245,7 +246,7 @@ static gint bet_array_date_sort_function ( GtkTreeModel *model,
     if ( date_b == NULL )
         return -1;
 
-    gint result = g_date_compare (date_b, date_a);
+    result = g_date_compare (date_b, date_a);
 
     if ( result == 0 )
     {
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 3ee5474..ed8a793 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -467,7 +467,7 @@ gboolean gsb_file_save_save_file ( const gchar *filename,
         /* it's a new file or stat couldn't find the permissions,
          * so set only user can see the file by default */
 #ifdef _MSC_VER
-    _   chmod ( filename, _S_IREAD | _S_IWRITE );
+	_chmod ( filename, _S_IREAD | _S_IWRITE );
 #else
         chmod ( filename, S_IRUSR | S_IWUSR );
 #endif /*_MSC_VER */
diff --git a/src/plugins/ofx/ofx.h b/src/plugins/ofx/ofx.h
index 1cd5929..9228b03 100644
--- a/src/plugins/ofx/ofx.h
+++ b/src/plugins/ofx/ofx.h
@@ -30,6 +30,9 @@ G_MODULE_EXPORT extern GSList * ofx_plugin_run ( GtkWidget * assistant,
 #endif
 
 #ifndef OFX_ERROR
+#ifdef _MSC_VER
+#undef ERROR
+#endif // _MSC_VER
 #define OFX_ERROR   ERROR
 #endif
 
diff --git a/src/utils_str.h b/src/utils_str.h
index 60d483e..83ae617 100644
--- a/src/utils_str.h
+++ b/src/utils_str.h
@@ -39,7 +39,7 @@ gint my_strncasecmp ( gchar *string_1,
 double my_strtod ( const gchar *nptr, gchar **endptr );
 G_MODULE_EXPORT gint utils_str_atoi ( const gchar *chaine );
 gint utils_str_get_nbre_motifs ( const gchar *chaine, const gchar *motif );
-gchar *utils_str_colon ( const gchar *s );
+G_MODULE_EXPORT gchar *utils_str_colon ( const gchar *s );
 gchar *utils_str_itoa ( gint integer );
 gchar *utils_str_dtostr ( gdouble number, gint nbre_decimal, gboolean canonical );
 gchar *utils_str_localise_decimal_point_from_string ( const gchar *string );
diff --git a/win32-msvc/CMakeLists.txt b/win32-msvc/CMakeLists.txt
index 10f3eb2..04a421a 100644
--- a/win32-msvc/CMakeLists.txt
+++ b/win32-msvc/CMakeLists.txt
@@ -525,11 +525,11 @@ ADD_CUSTOM_COMMAND(TARGET prepare_env
 	# COMMAND xcopy /S /Y /D ..\\share\\categories target\\Release\\help\\tips\\categories\\
 )
 
-ADD_CUSTOM_COMMAND(TARGET prepare_env
-	POST_BUILD
-	COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\$(PlatformName)\\$(ConfigurationName)\\help\\tips\\tips.txt
+#ADD_CUSTOM_COMMAND(TARGET prepare_env
+#	POST_BUILD
+#	COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\$(PlatformName)\\$(ConfigurationName)\\help\\tips\\tips#.txt
 	# COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\Release\\help\\tips\\tips.txt
-)
+#)
 
 set(
   po_files


hooks/post-receive
-- 
grisbi