summaryrefslogtreecommitdiff
path: root/svx/sdi/fmslots.sdi
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-11-02 22:47:48 +0100
committerMichael Stahl <mstahl@redhat.com>2016-11-02 22:49:18 +0100
commitf2761b62b3d0b45a3e57781a16c8c5c6ee94ded0 (patch)
treea0733afc85bfd95e7605ef6ddefb77c26406e743 /svx/sdi/fmslots.sdi
parent8cef9b4dbafdebc0566d6d7f715f27f978ddfe5b (diff)
jpeg-turbo: resolve some conflicts to fix poppler build
poppler uses both windows.h and jpeg headers, so runs into the conflict between Win32 definitions of boolean, INT16, INT32, and jpeg's. Tweak jpeg-turbo headers so it uses the Win32 definitions. Change-Id: I2dc2b35a8d08d521c95494e528c1e47ccbfc390a
Diffstat (limited to 'svx/sdi/fmslots.sdi')
0 files changed, 0 insertions, 0 deletions