Compile fixes for Windows after merging animation branch.

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index 6d0a67f33b1b11a6ef4586014c717b0017c227de..c873daf48e09e317311e9fcba792e1f63347dca1 100644 (file)
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -710,8 +710,8 @@ int mlt_properties_set( mlt_properties self, const char *name, const char *value
                                property_list *list = self->local;
                                if ( list->locale )
                                        current = strtod_l( id, NULL, list->locale );
+                else
 #endif
-                               else
                                        current = strtod( id, NULL );
                        }
                        else

diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index d9932dab3111703eaf12b1351ebd2f7657f69b34..801656f5b4b61b06ee653c7039273836b8626588 100644 (file)
--- a/src/framework/mlt_property.c
+++ b/src/framework/mlt_property.c
@@ -462,8 +462,8 @@ static double mlt_property_atof( const char *value, double fps, locale_t locale
 #if defined(__GLIBC__) || defined(__DARWIN__)
                if ( locale )
                        result = strtod_l( value, &end, locale );
+        else
 #endif
-               else
                        result = strtod( value, &end );
                if ( end && end[0] == '%' )
                        result /= 100.0;
@@ -1444,8 +1444,8 @@ mlt_rect mlt_property_get_rect( mlt_property self, locale_t locale )
 #if defined(__GLIBC__) || defined(__DARWIN__)
                        if ( locale )
                                temp = strtod_l( value, &p, locale );
+            else
 #endif
-                       else
                                temp = strtod( value, &p );
                        if ( p != value )
                        {