summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libmng
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-10-28 13:39:23 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-10-28 13:39:23 +0900
commit69e1261df646edf24612d7f953dac81182e7461b (patch)
tree5d9a9e9600f0592c3732fe7c9402134fd22d6651 /src/3rdparty/libmng
parentc9a75bccc60b6ac092f76a2624115fd8935f4888 (diff)
downloadtqt3-69e1261df646edf24612d7f953dac81182e7461b.tar.gz
tqt3-69e1261df646edf24612d7f953dac81182e7461b.zip
Drop Borland compiler specific code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/3rdparty/libmng')
-rw-r--r--src/3rdparty/libmng/libmng.h4
-rw-r--r--src/3rdparty/libmng/libmng_callback_xs.c7
-rw-r--r--src/3rdparty/libmng/libmng_chunk_io.c7
-rw-r--r--src/3rdparty/libmng/libmng_chunk_io.h4
-rw-r--r--src/3rdparty/libmng/libmng_chunk_prc.c7
-rw-r--r--src/3rdparty/libmng/libmng_chunk_prc.h4
-rw-r--r--src/3rdparty/libmng/libmng_chunk_xs.c7
-rw-r--r--src/3rdparty/libmng/libmng_chunks.h4
-rw-r--r--src/3rdparty/libmng/libmng_cms.c7
-rw-r--r--src/3rdparty/libmng/libmng_cms.h4
-rw-r--r--src/3rdparty/libmng/libmng_conf.h14
-rw-r--r--src/3rdparty/libmng/libmng_data.h4
-rw-r--r--src/3rdparty/libmng/libmng_display.c7
-rw-r--r--src/3rdparty/libmng/libmng_display.h4
-rw-r--r--src/3rdparty/libmng/libmng_dither.c7
-rw-r--r--src/3rdparty/libmng/libmng_dither.h4
-rw-r--r--src/3rdparty/libmng/libmng_error.c7
-rw-r--r--src/3rdparty/libmng/libmng_error.h4
-rw-r--r--src/3rdparty/libmng/libmng_filter.c7
-rw-r--r--src/3rdparty/libmng/libmng_filter.h4
-rw-r--r--src/3rdparty/libmng/libmng_hlapi.c7
-rw-r--r--src/3rdparty/libmng/libmng_jpeg.c7
-rw-r--r--src/3rdparty/libmng/libmng_jpeg.h4
-rw-r--r--src/3rdparty/libmng/libmng_memory.h4
-rw-r--r--src/3rdparty/libmng/libmng_object_prc.c7
-rw-r--r--src/3rdparty/libmng/libmng_object_prc.h4
-rw-r--r--src/3rdparty/libmng/libmng_objects.h4
-rw-r--r--src/3rdparty/libmng/libmng_pixels.c7
-rw-r--r--src/3rdparty/libmng/libmng_pixels.h4
-rw-r--r--src/3rdparty/libmng/libmng_prop_xs.c7
-rw-r--r--src/3rdparty/libmng/libmng_read.c7
-rw-r--r--src/3rdparty/libmng/libmng_read.h4
-rw-r--r--src/3rdparty/libmng/libmng_trace.c7
-rw-r--r--src/3rdparty/libmng/libmng_trace.h4
-rw-r--r--src/3rdparty/libmng/libmng_types.h14
-rw-r--r--src/3rdparty/libmng/libmng_write.c7
-rw-r--r--src/3rdparty/libmng/libmng_write.h4
-rw-r--r--src/3rdparty/libmng/libmng_zlib.c7
-rw-r--r--src/3rdparty/libmng/libmng_zlib.h4
-rw-r--r--src/3rdparty/libmng/makefiles/README1
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.bcb3105
41 files changed, 0 insertions, 336 deletions
diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h
index 924f40dbf..bbcbe6dc4 100644
--- a/src/3rdparty/libmng/libmng.h
+++ b/src/3rdparty/libmng/libmng.h
@@ -231,10 +231,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_h_
#define _libmng_h_
diff --git a/src/3rdparty/libmng/libmng_callback_xs.c b/src/3rdparty/libmng/libmng_callback_xs.c
index 690b3a817..b8d64a2e4 100644
--- a/src/3rdparty/libmng/libmng_callback_xs.c
+++ b/src/3rdparty/libmng/libmng_callback_xs.c
@@ -49,13 +49,6 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
/* ************************************************************************** */
/* * * */
diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c
index 0f61a708e..6c1be77c4 100644
--- a/src/3rdparty/libmng/libmng_chunk_io.c
+++ b/src/3rdparty/libmng/libmng_chunk_io.c
@@ -153,9 +153,6 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_objects.h"
#include "libmng_object_prc.h"
#include "libmng_chunks.h"
@@ -168,10 +165,6 @@
#include "libmng_pixels.h"
#include "libmng_chunk_io.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
/* * * */
/* * CRC - Cyclic Redundancy Check * */
diff --git a/src/3rdparty/libmng/libmng_chunk_io.h b/src/3rdparty/libmng/libmng_chunk_io.h
index d9056017c..b6f01810f 100644
--- a/src/3rdparty/libmng/libmng_chunk_io.h
+++ b/src/3rdparty/libmng/libmng_chunk_io.h
@@ -32,10 +32,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_chunk_io_h_
#define _libmng_chunk_io_h_
diff --git a/src/3rdparty/libmng/libmng_chunk_prc.c b/src/3rdparty/libmng/libmng_chunk_prc.c
index f3c27f486..d9274d658 100644
--- a/src/3rdparty/libmng/libmng_chunk_prc.c
+++ b/src/3rdparty/libmng/libmng_chunk_prc.c
@@ -42,17 +42,10 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_memory.h"
#include "libmng_chunks.h"
#include "libmng_chunk_prc.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
/* * * */
/* * General chunk routines * */
diff --git a/src/3rdparty/libmng/libmng_chunk_prc.h b/src/3rdparty/libmng/libmng_chunk_prc.h
index a1054d419..bb69033ac 100644
--- a/src/3rdparty/libmng/libmng_chunk_prc.h
+++ b/src/3rdparty/libmng/libmng_chunk_prc.h
@@ -28,10 +28,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_chunk_prc_h_
#define _libmng_chunk_prc_h_
diff --git a/src/3rdparty/libmng/libmng_chunk_xs.c b/src/3rdparty/libmng/libmng_chunk_xs.c
index 8ca3f472b..5edc01bfc 100644
--- a/src/3rdparty/libmng/libmng_chunk_xs.c
+++ b/src/3rdparty/libmng/libmng_chunk_xs.c
@@ -58,18 +58,11 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_memory.h"
#include "libmng_chunks.h"
#include "libmng_chunk_prc.h"
#include "libmng_chunk_io.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_ACCESS_CHUNKS
diff --git a/src/3rdparty/libmng/libmng_chunks.h b/src/3rdparty/libmng/libmng_chunks.h
index 0fe787135..9b458d654 100644
--- a/src/3rdparty/libmng/libmng_chunks.h
+++ b/src/3rdparty/libmng/libmng_chunks.h
@@ -42,10 +42,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_chunks_h_
#define _libmng_chunks_h_
diff --git a/src/3rdparty/libmng/libmng_cms.c b/src/3rdparty/libmng/libmng_cms.c
index d072e3717..ad64e7326 100644
--- a/src/3rdparty/libmng/libmng_cms.c
+++ b/src/3rdparty/libmng/libmng_cms.c
@@ -61,16 +61,9 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_objects.h"
#include "libmng_cms.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_cms.h b/src/3rdparty/libmng/libmng_cms.h
index 02d6c330d..31e0cea03 100644
--- a/src/3rdparty/libmng/libmng_cms.h
+++ b/src/3rdparty/libmng/libmng_cms.h
@@ -30,10 +30,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_cms_h_
#define _libmng_cms_h_
diff --git a/src/3rdparty/libmng/libmng_conf.h b/src/3rdparty/libmng/libmng_conf.h
index c910786ff..31d512c41 100644
--- a/src/3rdparty/libmng/libmng_conf.h
+++ b/src/3rdparty/libmng/libmng_conf.h
@@ -38,10 +38,6 @@
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_conf_h_
#define _libmng_conf_h_
@@ -90,16 +86,6 @@
/* #define MNG_SUPPORT_JPEG12 */
#endif
-/* The following is required to export the IJG routines from the DLL in
- the Windows-standard calling convention;
- currently this only works for Borland C++ !!! */
-
-#if defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#if defined(MNG_SUPPORT_IJG6B) && defined(__BORLANDC__)
-#define MNG_DEFINE_JPEG_STDCALL
-#endif
-#endif
-
/* ************************************************************************** */
/* enable required high-level functions */
diff --git a/src/3rdparty/libmng/libmng_data.h b/src/3rdparty/libmng/libmng_data.h
index e881ce1a6..79509e9a6 100644
--- a/src/3rdparty/libmng/libmng_data.h
+++ b/src/3rdparty/libmng/libmng_data.h
@@ -109,10 +109,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_data_h_
#define _libmng_data_h_
diff --git a/src/3rdparty/libmng/libmng_display.c b/src/3rdparty/libmng/libmng_display.c
index d2e460cd7..e177bd832 100644
--- a/src/3rdparty/libmng/libmng_display.c
+++ b/src/3rdparty/libmng/libmng_display.c
@@ -151,9 +151,6 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_objects.h"
#include "libmng_object_prc.h"
#include "libmng_memory.h"
@@ -163,10 +160,6 @@
#include "libmng_pixels.h"
#include "libmng_display.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_display.h b/src/3rdparty/libmng/libmng_display.h
index 32d3b5cc6..816630d72 100644
--- a/src/3rdparty/libmng/libmng_display.h
+++ b/src/3rdparty/libmng/libmng_display.h
@@ -41,10 +41,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_display_h_
#define _libmng_display_h_
diff --git a/src/3rdparty/libmng/libmng_dither.c b/src/3rdparty/libmng/libmng_dither.c
index 4f308e5d8..88d6e45ca 100644
--- a/src/3rdparty/libmng/libmng_dither.c
+++ b/src/3rdparty/libmng/libmng_dither.c
@@ -27,15 +27,8 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_dither.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
mng_retcode dither_a_row (mng_datap pData,
diff --git a/src/3rdparty/libmng/libmng_dither.h b/src/3rdparty/libmng/libmng_dither.h
index 7c8ab8a29..b860a6e52 100644
--- a/src/3rdparty/libmng/libmng_dither.h
+++ b/src/3rdparty/libmng/libmng_dither.h
@@ -23,10 +23,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_dither_h_
#define _libmng_dither_h_
diff --git a/src/3rdparty/libmng/libmng_error.c b/src/3rdparty/libmng/libmng_error.c
index 237f4671f..7870bf06f 100644
--- a/src/3rdparty/libmng/libmng_error.c
+++ b/src/3rdparty/libmng/libmng_error.c
@@ -59,13 +59,6 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_error.h b/src/3rdparty/libmng/libmng_error.h
index 9ea9316c7..712a76374 100644
--- a/src/3rdparty/libmng/libmng_error.h
+++ b/src/3rdparty/libmng/libmng_error.h
@@ -43,10 +43,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_error_h_
#define _libmng_error_h_
diff --git a/src/3rdparty/libmng/libmng_filter.c b/src/3rdparty/libmng/libmng_filter.c
index a055f5cbb..541db749d 100644
--- a/src/3rdparty/libmng/libmng_filter.c
+++ b/src/3rdparty/libmng/libmng_filter.c
@@ -32,15 +32,8 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_filter.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_FILTERS
diff --git a/src/3rdparty/libmng/libmng_filter.h b/src/3rdparty/libmng/libmng_filter.h
index 2c8c61d7d..9f87166c4 100644
--- a/src/3rdparty/libmng/libmng_filter.h
+++ b/src/3rdparty/libmng/libmng_filter.h
@@ -26,10 +26,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_filter_h_
#define _libmng_filter_h_
diff --git a/src/3rdparty/libmng/libmng_hlapi.c b/src/3rdparty/libmng/libmng_hlapi.c
index 9a897ffaf..50418c4c1 100644
--- a/src/3rdparty/libmng/libmng_hlapi.c
+++ b/src/3rdparty/libmng/libmng_hlapi.c
@@ -140,9 +140,6 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_objects.h"
#include "libmng_object_prc.h"
#include "libmng_chunks.h"
@@ -155,10 +152,6 @@
#include "libmng_cms.h"
#include "libmng_pixels.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
/* * * */
/* * local routines * */
diff --git a/src/3rdparty/libmng/libmng_jpeg.c b/src/3rdparty/libmng/libmng_jpeg.c
index dba8bf56e..872f8a9c0 100644
--- a/src/3rdparty/libmng/libmng_jpeg.c
+++ b/src/3rdparty/libmng/libmng_jpeg.c
@@ -49,17 +49,10 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_memory.h"
#include "libmng_pixels.h"
#include "libmng_jpeg.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_JNG
diff --git a/src/3rdparty/libmng/libmng_jpeg.h b/src/3rdparty/libmng/libmng_jpeg.h
index 0f1aa6f11..8f987a7a8 100644
--- a/src/3rdparty/libmng/libmng_jpeg.h
+++ b/src/3rdparty/libmng/libmng_jpeg.h
@@ -26,10 +26,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_jpeg_h_
#define _libmng_jpeg_h_
diff --git a/src/3rdparty/libmng/libmng_memory.h b/src/3rdparty/libmng/libmng_memory.h
index 568d32411..c4eceb93f 100644
--- a/src/3rdparty/libmng/libmng_memory.h
+++ b/src/3rdparty/libmng/libmng_memory.h
@@ -28,10 +28,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_memory_h_
#define _libmng_memory_h_
diff --git a/src/3rdparty/libmng/libmng_object_prc.c b/src/3rdparty/libmng/libmng_object_prc.c
index 6915db85d..937bc6c4e 100644
--- a/src/3rdparty/libmng/libmng_object_prc.c
+++ b/src/3rdparty/libmng/libmng_object_prc.c
@@ -86,19 +86,12 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_memory.h"
#include "libmng_objects.h"
#include "libmng_display.h"
#include "libmng_pixels.h"
#include "libmng_object_prc.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_object_prc.h b/src/3rdparty/libmng/libmng_object_prc.h
index 7a1c78687..397764c96 100644
--- a/src/3rdparty/libmng/libmng_object_prc.h
+++ b/src/3rdparty/libmng/libmng_object_prc.h
@@ -41,10 +41,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_object_prc_h_
#define _libmng_object_prc_h_
diff --git a/src/3rdparty/libmng/libmng_objects.h b/src/3rdparty/libmng/libmng_objects.h
index 67647f361..71458275d 100644
--- a/src/3rdparty/libmng/libmng_objects.h
+++ b/src/3rdparty/libmng/libmng_objects.h
@@ -52,10 +52,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_objects_h_
#define _libmng_objects_h_
diff --git a/src/3rdparty/libmng/libmng_pixels.c b/src/3rdparty/libmng/libmng_pixels.c
index 737921722..75a7e7254 100644
--- a/src/3rdparty/libmng/libmng_pixels.c
+++ b/src/3rdparty/libmng/libmng_pixels.c
@@ -114,19 +114,12 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_objects.h"
#include "libmng_memory.h"
#include "libmng_cms.h"
#include "libmng_filter.h"
#include "libmng_pixels.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_pixels.h b/src/3rdparty/libmng/libmng_pixels.h
index aa97c700e..54283c4fc 100644
--- a/src/3rdparty/libmng/libmng_pixels.h
+++ b/src/3rdparty/libmng/libmng_pixels.h
@@ -48,10 +48,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_pixels_h_
#define _libmng_pixels_h_
diff --git a/src/3rdparty/libmng/libmng_prop_xs.c b/src/3rdparty/libmng/libmng_prop_xs.c
index cd4ec7e0e..cd6337d70 100644
--- a/src/3rdparty/libmng/libmng_prop_xs.c
+++ b/src/3rdparty/libmng/libmng_prop_xs.c
@@ -82,15 +82,8 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_cms.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
/* * * */
/* * Property set functions * */
diff --git a/src/3rdparty/libmng/libmng_read.c b/src/3rdparty/libmng/libmng_read.c
index d93da7a19..fe68a9f5a 100644
--- a/src/3rdparty/libmng/libmng_read.c
+++ b/src/3rdparty/libmng/libmng_read.c
@@ -67,9 +67,6 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_memory.h"
#include "libmng_objects.h"
#include "libmng_object_prc.h"
@@ -79,10 +76,6 @@
#include "libmng_display.h"
#include "libmng_read.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_READ_PROCS
diff --git a/src/3rdparty/libmng/libmng_read.h b/src/3rdparty/libmng/libmng_read.h
index 280043dab..1d62e6d9e 100644
--- a/src/3rdparty/libmng/libmng_read.h
+++ b/src/3rdparty/libmng/libmng_read.h
@@ -23,10 +23,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_read_h_
#define _libmng_read_h_
diff --git a/src/3rdparty/libmng/libmng_trace.c b/src/3rdparty/libmng/libmng_trace.c
index 68a8fa264..b2c14b48c 100644
--- a/src/3rdparty/libmng/libmng_trace.c
+++ b/src/3rdparty/libmng/libmng_trace.c
@@ -109,13 +109,6 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_trace.h b/src/3rdparty/libmng/libmng_trace.h
index 0a5da86ce..c8070869d 100644
--- a/src/3rdparty/libmng/libmng_trace.h
+++ b/src/3rdparty/libmng/libmng_trace.h
@@ -114,10 +114,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_trace_h_
#define _libmng_trace_h_
diff --git a/src/3rdparty/libmng/libmng_types.h b/src/3rdparty/libmng/libmng_types.h
index a5bd852b1..271354058 100644
--- a/src/3rdparty/libmng/libmng_types.h
+++ b/src/3rdparty/libmng/libmng_types.h
@@ -107,10 +107,6 @@
/* ************************************************************************** */
-#ifdef __BORLANDC__
-#pragma option -AT /* turn off strict ANSI-C for the moment */
-#endif
-
#ifndef WIN32
#if defined(_WIN32) || defined(__WIN32__) || defined(_Windows) || defined(_WINDOWS)
#define WIN32 /* gather them into a single define */
@@ -181,13 +177,7 @@
#include <limits.h> /* get proper integer widths */
#ifdef WIN32
-/* B003 */
-#if defined __BORLANDC__
-#include <mem.h> /* defines "memcpy" for BCB */
-#else
#include <memory.h> /* defines "memcpy" for other win32 platforms */
-#endif
-/* B003 */
#ifdef MNG_CHECK_BAD_ICCP
#include <string.h> /* strncmp() */
#endif
@@ -235,10 +225,6 @@
#define MNG_EXT
#endif /* MNG_DLL && WIN32 */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* now force ANSI-C from here on */
-#endif
-
/* ************************************************************************** */
#if USHRT_MAX == 0xffffffffU /* get the proper 32-bit width !!! */
diff --git a/src/3rdparty/libmng/libmng_write.c b/src/3rdparty/libmng/libmng_write.c
index 07a530f83..52d5a1675 100644
--- a/src/3rdparty/libmng/libmng_write.c
+++ b/src/3rdparty/libmng/libmng_write.c
@@ -35,18 +35,11 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_memory.h"
#include "libmng_chunks.h"
#include "libmng_chunk_io.h"
#include "libmng_write.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_WRITE_PROCS
diff --git a/src/3rdparty/libmng/libmng_write.h b/src/3rdparty/libmng/libmng_write.h
index df72396c6..d3d9af4cd 100644
--- a/src/3rdparty/libmng/libmng_write.h
+++ b/src/3rdparty/libmng/libmng_write.h
@@ -23,10 +23,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_write_h_
#define _libmng_write_h_
diff --git a/src/3rdparty/libmng/libmng_zlib.c b/src/3rdparty/libmng/libmng_zlib.c
index 0730b2fbe..f5eacb3aa 100644
--- a/src/3rdparty/libmng/libmng_zlib.c
+++ b/src/3rdparty/libmng/libmng_zlib.c
@@ -45,18 +45,11 @@
#include "libmng_data.h"
#include "libmng_error.h"
#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
#include "libmng_memory.h"
#include "libmng_pixels.h"
#include "libmng_filter.h"
#include "libmng_zlib.h"
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
/* ************************************************************************** */
#ifdef MNG_INCLUDE_ZLIB
diff --git a/src/3rdparty/libmng/libmng_zlib.h b/src/3rdparty/libmng/libmng_zlib.h
index e5bfbdba9..7a299ae87 100644
--- a/src/3rdparty/libmng/libmng_zlib.h
+++ b/src/3rdparty/libmng/libmng_zlib.h
@@ -23,10 +23,6 @@
/* * * */
/* ************************************************************************** */
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
#ifndef _libmng_zlib_h_
#define _libmng_zlib_h_
diff --git a/src/3rdparty/libmng/makefiles/README b/src/3rdparty/libmng/makefiles/README
index 366100293..e71b584c5 100644
--- a/src/3rdparty/libmng/makefiles/README
+++ b/src/3rdparty/libmng/makefiles/README
@@ -15,7 +15,6 @@ libmng.com) and I'll be happy to include it in the next release!
Current files:
-makefile.bcb3 - Borland C++ Builder
makefile.vcwin32 - Microsoft Visual C++
makefile.unix - generic Unix
makefile.linux - Linux ELF (builds shared library)
diff --git a/src/3rdparty/libmng/makefiles/makefile.bcb3 b/src/3rdparty/libmng/makefiles/makefile.bcb3
deleted file mode 100644
index 5c4e43477..000000000
--- a/src/3rdparty/libmng/makefiles/makefile.bcb3
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is suitable for Borland C++ Builder.
-# it works (at least) with Borland C++ Builder v3
-
-# Configuration options are now in mng_conf.h
-# this option forces dll compatibility
-MNGOPT = -DMNG_BUILD_DLL
-
-# The name of your C compiler:
-CC= bcc32
-
-# compiler options:
-CFLAGS= -WD -O2 -Hc -w-par -k -y -v -vi -c -tWD \
- -wuse -wucp -wstv -wstu -wsig -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp \
- -wamb -Tkh30000 -ff -5 -I.;..\zlib;..\jpgsrc6b;..\lcms\include $(MNGOPT)
-
-# source files
-SOURCES= libmng_hlapi.c libmng_callback_xs.c libmng_prop_xs.c libmng_chunk_xs.c \
- libmng_read.c libmng_write.c libmng_display.c \
- libmng_object_prc.c libmng_chunk_prc.c libmng_chunk_io.c libmng_error.c \
- libmng_trace.c libmng_pixels.c libmng_filter.c libmng_dither.c \
- libmng_zlib.c libmng_jpeg.c libmng_cms.c
-
-# object files
-OBJECTS= libmng_hlapi.obj libmng_callback_xs.obj libmng_prop_xs.obj libmng_chunk_xs.obj \
- libmng_read.obj libmng_write.obj libmng_display.obj \
- libmng_object_prc.obj libmng_chunk_prc.obj libmng_chunk_io.obj libmng_error.obj \
- libmng_trace.obj libmng_pixels.obj libmng_filter.obj libmng_dither.obj \
- libmng_zlib.obj libmng_jpeg.obj libmng_cms.obj
-
-# type dependancies
-.c.obj:
- $(CC) $(CFLAGS) -c{ $<}
-
-# make options
-all: libmng.lib
-
-clean:
- - del *.obj
- - del libmng.lib
-
-# file dependancies
-libmng.lib: $(OBJECTS)
- - del libmng.lib
- tlib libmng.lib /E /C @&&|
-+libmng_hlapi.obj +libmng_callback_xs.obj +libmng_prop_xs.obj +libmng_chunk_xs.obj &
-+libmng_read.obj +libmng_write.obj +libmng_display.obj &
-+libmng_object_prc.obj +libmng_chunk_prc.obj +libmng_chunk_io.obj +libmng_error.obj &
-+libmng_trace.obj +libmng_pixels.obj +libmng_filter.obj +libmng_dither.obj &
-+libmng_zlib.obj +libmng_jpeg.obj +libmng_cms.obj
-|
-
-libmng_hlapi.obj: libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
- libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.obj: libmng_callback_xs.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.obj: libmng_prop_xs.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.obj: libmng_chunk_xs.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_error.h libmng_trace.h
-libmng_read.obj: libmng_read.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.obj: libmng_write.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.obj: libmng_display.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h \
- libmng_pixels.h libmng_display.h
-libmng_object_prc.obj: libmng_object_prc.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_prc.obj: libmng_chunk_prc.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_io.obj: libmng_chunk_io.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h libmng_chunks.h \
- libmng_chunk_io.h libmng_chunk_prc libmng_memory.h libmng_error.h \
- libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.obj: libmng_error.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.obj: libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.obj: libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.obj: libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.obj: libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.obj: libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
- libmng_filter.h libmng_zlib.h
-libmng_jpeg.obj: libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_pixels.h libmng_jpeg.h
-libmng_cms.obj: libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
-