From: Michael R Sweet Date: Tue, 18 Mar 2025 19:04:10 +0000 (-0400) Subject: More VC++ updates. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25f65dd9600bfdf9850d97daaba3d491e245c58e;p=thirdparty%2Fcups.git More VC++ updates. --- diff --git a/cups/dnssd.c b/cups/dnssd.c index 696593e854..87e5bf8cd3 100644 --- a/cups/dnssd.c +++ b/cups/dnssd.c @@ -401,7 +401,7 @@ cupsDNSSDBrowseNew( #elif _WIN32 DNS_STATUS status; // DNS request status - size_t i, // Looping var + int i, // Looping var count; // Number of types const char *base, // Base query name *subtype; // Subtype diff --git a/cups/dnssd.h b/cups/dnssd.h index f3388bc8bf..69012653a5 100644 --- a/cups/dnssd.h +++ b/cups/dnssd.h @@ -10,6 +10,7 @@ #ifndef _CUPS_DNSSD_H_ # define _CUPS_DNSSD_H_ # include "cups.h" +# include # ifdef __cplusplus extern "C" { # endif // __cplusplus diff --git a/cups/testdnssd.c b/cups/testdnssd.c index 6b6fd5e226..bdf4413c37 100644 --- a/cups/testdnssd.c +++ b/cups/testdnssd.c @@ -7,6 +7,7 @@ // information. // +#include #include "test-internal.h" #include "dnssd.h" #include "thread.h" diff --git a/vcnet/config.h b/vcnet/config.h index 93d2200931..0f79779e47 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -1,7 +1,7 @@ /* * Configuration file for CUPS on Windows. * - * Copyright © 2021-2024 by OpenPrinting + * Copyright © 2021-2025 by OpenPrinting * Copyright © 2007-2019 by Apple Inc. * Copyright © 1997-2007 by Easy Software Products. * @@ -12,10 +12,6 @@ #ifndef _CUPS_CONFIG_H_ #define _CUPS_CONFIG_H_ -/* - * Include necessary headers... - */ - #include #include #include @@ -379,7 +375,7 @@ typedef unsigned long useconds_t; * Do we have mDNSResponder for DNS-SD? */ -#define HAVE_MDNSRESPONDER 1 +/* #undef HAVE_MDNSRESPONDER */ /* diff --git a/vcnet/cups.sln b/vcnet/cups.sln index 0556636367..a6784d6565 100644 --- a/vcnet/cups.sln +++ b/vcnet/cups.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2036 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.35325.158 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcups2", "libcups2.vcxproj", "{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" EndProject @@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcxproj" EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcxproj", "{18950A1B-D37A-40C7-B2DF-C12986C0526E}" - ProjectSection(ProjectDependencies) = postProject - {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} = {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ippfind", "ippfind.vcxproj", "{B484DA0C-62C8-4C32-83B6-CCEB58968B85}" ProjectSection(ProjectDependencies) = postProject diff --git a/vcnet/testdnssd.vcxproj b/vcnet/testdnssd.vcxproj index e190a1560c..7a95d9dd49 100644 --- a/vcnet/testdnssd.vcxproj +++ b/vcnet/testdnssd.vcxproj @@ -102,7 +102,7 @@ - + {cb4aa6f2-3e84-45be-b505-95cd375e8be3}