diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-10-28 20:41:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-01 04:16:45 -0500 |
| commit | dc6c7e844a02a59133e96553000666be87b1a74e (patch) | |
| tree | 0bbbcd9af07780b85a2c1fddcdfd7caedf79ece8 /vcl | |
| parent | 831fc27e2a1478c9edb3d19134d85a5af834049e (diff) | |
i#118517# - Update twain to version 2.1 with support for Apple and UNIX.
Mingw apparently tries to pass as GNUC and WIN32/64 so we detect it early and force it to work like in previous versions.
Cherry-picked from:
e1431bbb4eff94d7c2ca1e0660a13806cd6489f5
Also contains:
f30110565adafc75feb73eac9707d6d5f86f90f4 - Fix issue with twain header.
1d6adce05b0d7737268be32b1c24aef8254f48b2 - Minor style fix.
Conflicts:
twain/inc/twain.h
Change-Id: I67c557b81661bc91e299309ade70d603160b6bca
Reviewed-on: https://gerrit.libreoffice.org/6508
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
0 files changed, 0 insertions, 0 deletions