Kaydet (Commit) dc6c7e84 authored tarafından Pedro Giffuni's avatar Pedro Giffuni Kaydeden (comit) Caolán McNamara

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:

e1431bbb

Also contains:

f3011056 - Fix issue with twain header.
1d6adce0 - Minor style fix.

Conflicts:
	twain/inc/twain.h

Change-Id: I67c557b81661bc91e299309ade70d603160b6bca
Reviewed-on: https://gerrit.libreoffice.org/6508Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 831fc27e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment