Fix some build issues (Issue #674)

diff --git a/CHANGES.md b/CHANGES.md
index 00efcded87209e9bcc228d28a87b4ccd1a4b9771..c273e3d88812b2563e5a8ffb2788d262bdace619 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,8 @@ Changes in CUPS v2.5b1 (TBA)
 - Updated CUPS to require ZLIB.
 - Updated CUPS to require support for `poll` API.
 - Updated `cupsArray` APIs to support modern naming and types.
+- Updated internal usage of CUPS array API to include callback pointer even when
+  not used (Issue #674)
 - Updated `cups_enum_dests()` timeout for listing available IPP printers
   (Issue #751)
 - Updated `httpAddrConnect2()` to handle `POLLHUP` together with `POLLIN` or

diff --git a/cups/dest.c b/cups/dest.c
index d406af2270c304e59480fb00896033559c3a32e4..103e878bbd2de7103575a85d76b0df09d85f09e7 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -125,7 +125,7 @@ static int          cups_block_cb(cups_dest_block_t block, unsigned flags, cups_dest_t *
 #endif // __BLOCKS__
 static int             cups_compare_dests(cups_dest_t *a, cups_dest_t *b);
 static void            cups_dest_browse_cb(cups_dnssd_browse_t *browse, void *cb_data, cups_dnssd_flags_t flags, uint32_t if_index, const char *name, const char *regtype, const char *domain);
-static int             cups_dnssd_compare_devices(_cups_dnssd_device_t *a, _cups_dnssd_device_t *b);
+static int             cups_dnssd_compare_devices(_cups_dnssd_device_t *a, _cups_dnssd_device_t *b, void *data);
 static void            cups_dnssd_free_device(_cups_dnssd_device_t *device, _cups_dnssd_data_t *data);
 static _cups_dnssd_device_t *cups_dnssd_get_device(_cups_dnssd_data_t *data, const char *serviceName, const char *regtype, const char *replyDomain);
 static void            cups_dest_query_cb(cups_dnssd_query_t *query, void *cb_data, cups_dnssd_flags_t flags, uint32_t if_index, const char *fullname, uint16_t rrtype, const void *qdata, uint16_t qlen);

diff --git a/scheduler/auth.c b/scheduler/auth.c
index 26bc9f3d0c9674958506fc7d5b8c408afd27e31e..669ff1667dcc4d2e521030e27f7f96d7b5b26f32 100644 (file)
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -157,8 +157,8 @@ cupsdAddName(cupsd_location_t *loc, /* I - Location to add to */
 
   if (!loc->names)
     loc->names = cupsArrayNew3(NULL, NULL, NULL, 0,
-                               (cups_acopy_func_t)_cupsStrPrivAlloc,
-                               (cups_afree_func_t)_cupsStrPrivFree);
+                               (cups_acopy_func_t)_cupsArrayStrdup,
+                               (cups_afree_func_t)_cupsArrayFree);
 
   if (!cupsArrayAdd(loc->names, name))
   {