[mapserver-commits] r10046 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-04-06 11:56:10 -0400 (Tue, 06 Apr 2010)
New Revision: 10046

Modified:
   trunk/mapserver/mapserver.h
   trunk/mapserver/maputil.c
Log:
avoid use of inline keyword for C code (#3327)

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2010-04-06 03:54:52 UTC (rev 10045)
+++ trunk/mapserver/mapserver.h	2010-04-06 15:56:10 UTC (rev 10046)
@@ -2657,10 +2657,10 @@
 int msSaveRasterBufferToBuffer(rasterBufferObj *data, bufferObj *buffer,
         outputFormatObj *format);
 
-inline void msBufferInit(bufferObj *buffer);
-inline void msBufferResize(bufferObj *buffer, size_t target_size);
-MS_DLL_EXPORT  inline void msBufferFree(bufferObj *buffer);
-MS_DLL_EXPORT  inline void msBufferAppend(bufferObj *buffer, void *data, size_t length);
+void msBufferInit(bufferObj *buffer);
+void msBufferResize(bufferObj *buffer, size_t target_size);
+MS_DLL_EXPORT void msBufferFree(bufferObj *buffer);
+MS_DLL_EXPORT void msBufferAppend(bufferObj *buffer, void *data, size_t length);
 
 struct rendererVTable {
 	int supports_transparent_layers;

Modified: trunk/mapserver/maputil.c
===================================================================
--- trunk/mapserver/maputil.c	2010-04-06 03:54:52 UTC (rev 10045)
+++ trunk/mapserver/maputil.c	2010-04-06 15:56:10 UTC (rev 10046)
@@ -1939,14 +1939,14 @@
     return MS_SUCCESS;
 }
 
-inline void msBufferInit(bufferObj *buffer) {
+void msBufferInit(bufferObj *buffer) {
     buffer->data=NULL;
     buffer->size=0;
     buffer->available=0;
     buffer->_next_allocation_size = MS_DEFAULT_BUFFER_ALLOC;
 }
 
-inline void msBufferResize(bufferObj *buffer, size_t target_size){
+void msBufferResize(bufferObj *buffer, size_t target_size){
     while(buffer->available <= target_size) {
         buffer->data = realloc(buffer->data,buffer->available+buffer->_next_allocation_size);
         buffer->available += buffer->_next_allocation_size;
@@ -1954,7 +1954,7 @@
     }
 }
 
-inline void msBufferAppend(bufferObj *buffer, void *data, size_t length) {
+void msBufferAppend(bufferObj *buffer, void *data, size_t length) {
     if(buffer->available < buffer->size+length) {
         msBufferResize(buffer,buffer->size+length);
     }
@@ -1962,7 +1962,7 @@
     buffer->size += length;
 }
 
-inline void msBufferFree(bufferObj *buffer) {
+void msBufferFree(bufferObj *buffer) {
     if(buffer->available>0)
         free(buffer->data);
 }