Mercurial > octave-nkf
comparison src/txt-eng-ft.cc @ 13730:a2c74b5c02de
[MSVC] Prevent duplicate symbol.
* txt-eng-ft.cc: Include PermMatrix.h, only for MSVC.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 20 Oct 2011 12:54:32 +0100 |
parents | d2b799e3178a |
children | e1f76bfe0452 |
comparison
equal
deleted
inserted
replaced
13729:d13b6086aea9 | 13730:a2c74b5c02de |
---|---|
52 { | 52 { |
53 warning_with_id ("Octave:glyph-render", | 53 warning_with_id ("Octave:glyph-render", |
54 "ft_render: unable to render glyph for character `%c'", | 54 "ft_render: unable to render glyph for character `%c'", |
55 c); | 55 c); |
56 } | 56 } |
57 | |
58 #ifdef _MSC_VER | |
59 // This is just a trick to avoid multiply symbols definition. | |
60 // PermMatrix.h contains a dllexport'ed Array<octave_idx_type> | |
61 // that will make MSVC not to generate new instantiation and | |
62 // use the imported one. | |
63 #include "PermMatrix.h" | |
64 #endif | |
57 | 65 |
58 class | 66 class |
59 ft_manager | 67 ft_manager |
60 { | 68 { |
61 public: | 69 public: |