Changeset 685 for branches

Show
Ignore:
Timestamp:
03/31/08 11:53:54 (8 months ago)
Author:
artem
Message:

minor tweaks to keep win32 build happy

Location:
branches/stable/0.5
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • branches/stable/0.5/include/mapnik/agg_renderer.hpp

    r637 r685  
    4040namespace mapnik { 
    4141    
    42    class rasterizer; 
     42   struct rasterizer; 
    4343    
    4444   template <typename T> 

  • branches/stable/0.5/include/mapnik/octree.hpp

    r631 r685  
    2525#define _OCTREE_HPP_ 
    2626 
     27#include <mapnik/global.hpp> 
    2728#include <boost/format.hpp> 
    2829#include <boost/utility.hpp> 

  • branches/stable/0.5/include/mapnik/unicode.hpp

    r578 r685  
    2929} 
    3030 
     31#include <mapnik/config.hpp> 
    3132#include <boost/utility.hpp> 
     33#include <string> 
    3234 
    3335namespace mapnik { 
    34    class transcoder : private boost::noncopyable 
     36   class MAPNIK_DECL transcoder : private boost::noncopyable 
    3537   { 
    3638      public: 

  • branches/stable/0.5/src/unicode.cpp

    r621 r685  
    166166      std::cerr << "ENCODING = " << encoding << "\n";  
    167167#endif 
    168        
     168 
     169#ifdef _WIN32 
     170      desc_ = iconv_open("UTF-16LE",encoding.c_str()); 
     171#else 
    169172#ifndef WORDS_BIGENDIAN 
    170173      desc_ = iconv_open("UCS-4LE",encoding.c_str()); 
    … …  
    172175      desc_ = iconv_open("UCS-4BE",encoding.c_str()); 
    173176#endif 
     177#endif 
    174178   } 
    175179    
    … …  
    180184      std::wstring output(inleft,0); 
    181185      size_t outleft = inleft * sizeof(wchar_t); 
    182 #if (!defined(OSX_LEOPARD) && defined(DARWIN)) || defined(SUNOS) || defined(FREEBSD) 
     186#if (!defined(OSX_LEOPARD) && defined(DARWIN)) || defined(SUNOS) || defined(FREEBSD) || defined(_WIN32) 
    183187      const char * in = input.c_str(); 
    184188#else