1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
|
Description: Fix FTBFS with GCC 15
Author: Adrian Bunk <bunk@debian.org>
Bug-Debian: https://bugs.debian.org/1096526
Origin: backport
--- dillo-3.0.5.orig/lout/misc.hh
+++ dillo-3.0.5/lout/misc.hh
@@ -325,23 +325,6 @@ public:
this->startExtra = -1;
}
- inline NotSoSimpleVector (const NotSoSimpleVector &o)
- {
- this->arrayMain = NULL;
- this->numMain = o.numMain;
- this->numAllocMain = o.numAllocMain;
- resizeMain ();
- memcpy (this->arrayMain, o.arrayMain, sizeof (T) * numMain);
-
- this->arrayExtra = NULL;
- this->numExtra = o.numExtra;
- this->numAllocExtra = o.numAllocExtra;
- resizeExtra ();
- memcpy (this->arrayExtra, o.arrayExtra, sizeof (T) * numExtra);
-
- this->startExtra = o.startExtra;
- }
-
inline ~NotSoSimpleVector ()
{
if (this->arrayMain)
--- dillo-3.0.5.orig/src/cache.c
+++ dillo-3.0.5/src/cache.c
@@ -1298,7 +1298,7 @@ static CacheEntry_t *Cache_process_queue
/*
* Callback function for Cache_delayed_process_queue.
*/
-static void Cache_delayed_process_queue_callback()
+static void Cache_delayed_process_queue_callback(void *ptr)
{
CacheEntry_t *entry;
--- dillo-3.0.5.orig/src/jpeg.c
+++ dillo-3.0.5/src/jpeg.c
@@ -123,7 +123,7 @@ static void Jpeg_close(DilloJpeg *jpeg,
* static void init_source(j_decompress_ptr cinfo)
* (declaring it with no parameter avoids a compiler warning)
*/
-static void init_source()
+static void init_source(struct jpeg_decompress_struct *p)
{
}
@@ -180,7 +180,7 @@ static void skip_input_data(j_decompress
* static void term_source(j_decompress_ptr cinfo)
* (declaring it with no parameter avoids a compiler warning)
*/
-static void term_source()
+static void term_source(struct jpeg_decompress_struct *p)
{
}
|