fix windows build

qgis · Oct 17, 2012 · 4f1cac3 · 4f1cac3
1 parent bb3815f
commit 4f1cac3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -177,20 +177,20 @@ inline bool doubleNearSig( double a, double b, int significantDigits = 10 )
     Works like C malloc() but prints debug message by QgsLogger if allocation fails.
     @param size size in bytes
  */
-void *QgsMalloc( size_t size );
+void CORE_EXPORT *QgsMalloc( size_t size );
 
 /** Allocates  memory for an array of nmemb elements of size bytes each and returns
     a pointer to the allocated memory. Works like C calloc() but prints debug message
     by QgsLogger if allocation fails.
     @param nmemb number of elements
     @param size size of element in bytes
  */
-void *QgsCalloc( size_t nmemb, size_t size );
+void CORE_EXPORT *QgsCalloc( size_t nmemb, size_t size );
 
 /** Frees the memory space  pointed  to  by  ptr. Works like C free().
     @param ptr pointer to memory space
  */
-void QgsFree( void *ptr );
+void CORE_EXPORT QgsFree( void *ptr );
 
 /** Wkt string that represents a geographic coord sys
  * @note added in 1.8 to replace GEOWkt

diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
@@ -161,7 +161,7 @@ void TestQgsAtlasComposition::filename()
 void TestQgsAtlasComposition::autoscale_render()
 {
   mAtlas->setFixedScale( false );
-  mAtlas->setMargin( 0.10 );
+  mAtlas->setMargin( 0.10f );
 
   mAtlas->beginRender();