Fix spelling of "accordion".

[thirdparty/cups.git] / vcnet / config.h

diff --git a/vcnet/config.h b/vcnet/config.h
index 30c188e13169df17b0eb9d39bd6c3ed3d6c00487..993470fe9e68446e7cd3ec076bd7eb8a18e743eb 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,14 +1,11 @@
 /*
  * Configuration file for CUPS on Windows.
  *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 #ifndef _CUPS_CONFIG_H_
@@ -44,20 +41,18 @@
 #define open           _open
 #define read           _read
 #define rmdir          _rmdir
-#define snprintf       _snprintf
 #define strdup         _strdup
 #define unlink         _unlink
-#define vsnprintf      _vsnprintf
 #define write          _write
 
 
 /*
- * Map the POSIX strcasecmp() and strncasecmp() functions to the Win32 stricmp()
- * and strnicmp() functions...
+ * Map the POSIX strcasecmp() and strncasecmp() functions to the Win32
+ * _stricmp() and _strnicmp() functions...
  */
 
-#define strcasecmp     stricmp
-#define strncasecmp    strnicmp
+#define strcasecmp     _stricmp
+#define strncasecmp    _strnicmp
 
 
 /*
@@ -94,8 +89,8 @@ typedef unsigned long useconds_t;
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2"
-#define CUPS_MINIMAL "CUPS/2.2"
+#define CUPS_SVERSION "CUPS v2.3.1"
+#define CUPS_MINIMAL "CUPS/2.3.1"
 
 
 /*
@@ -106,13 +101,14 @@ typedef unsigned long useconds_t;
 #define CUPS_DEFAULT_GROUP     ""
 #define CUPS_DEFAULT_SYSTEM_GROUPS ""
 #define CUPS_DEFAULT_PRINTOPERATOR_AUTH ""
+#define CUPS_DEFAULT_SYSTEM_AUTHKEY ""
 
 
 /*
  * Default file permissions...
  */
 
-#define CUPS_DEFAULT_CONFIG_FILE_PERM 0640
+#define CUPS_DEFAULT_CONFIG_FILE_PERM 0644
 #define CUPS_DEFAULT_LOG_FILE_PERM 0644
 
 
@@ -121,7 +117,7 @@ typedef unsigned long useconds_t;
  */
 
 #define CUPS_DEFAULT_LOG_LEVEL "warn"
-#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions"
+#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "none"
 
 
 /*
@@ -136,7 +132,7 @@ typedef unsigned long useconds_t;
  */
 
 #define CUPS_DEFAULT_BROWSING 1
-#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS ""
+#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "dnssd"
 #define CUPS_DEFAULT_DEFAULT_SHARED 1
 
 
@@ -180,7 +176,7 @@ typedef unsigned long useconds_t;
  * Default WebInterface value...
  */
 
-#undef CUPS_DEFAULT_WEBIF
+#define CUPS_DEFAULT_WEBIF 0
 
 
 /*
@@ -315,12 +311,20 @@ typedef unsigned long useconds_t;
 /* #undef HAVE_VSYSLOG */
 
 
+/*
+ * Do we have the systemd journal functions?
+ */
+
+/* #undef HAVE_SYSTEMD_SD_JOURNAL_H */
+
+
 /*
  * Do we have the (v)snprintf() functions?
  */
 
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
+/* Windows snprintf/vsnprintf are non-conforming */
+/* #undef HAVE_SNPRINTF */
+/* #undef HAVE_VSNPRINTF */
 
 
 /*
@@ -367,8 +371,15 @@ typedef unsigned long useconds_t;
 
 /* #undef HAVE_CDSASSL */
 /* #undef HAVE_GNUTLS */
-#define HAVE_SSPISSL
-#define HAVE_SSL
+#define HAVE_SSPISSL 1
+#define HAVE_SSL 1
+
+
+/*
+ * Do we have the gnutls_fips140_set_mode function?
+ */
+
+/* #undef HAVE_GNUTLS_FIPS140_SET_MODE */
 
 
 /*
@@ -390,21 +401,9 @@ typedef unsigned long useconds_t;
  */
 
 /* #undef HAVE_AUTHORIZATION_H */
-/* #undef HAVE_SECBASEPRIV_H */
 /* #undef HAVE_SECCERTIFICATE_H */
-/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */
 /* #undef HAVE_SECITEM_H */
-/* #undef HAVE_SECITEMPRIV_H */
 /* #undef HAVE_SECPOLICY_H */
-/* #undef HAVE_SECPOLICYPRIV_H */
-/* #undef HAVE_SECURETRANSPORTPRIV_H */
-
-
-/*
- * Do we have the cssmErrorString function?
- */
-
-/* #undef HAVE_CSSMERRORSTRING */
 
 
 /*
@@ -414,13 +413,6 @@ typedef unsigned long useconds_t;
 /* #undef HAVE_SECGENERATESELFSIGNEDCERTIFICATE */
 
 
-/*
- * Do we have the SecKeychainOpen function?
- */
-
-/* #undef HAVE_SECKEYCHAINOPEN */
-
-
 /*
  * Do we have libpaper?
  */
@@ -563,26 +555,10 @@ typedef unsigned long useconds_t;
 
 
 /*
- * Various scripting languages...
- */
-
-/* #undef HAVE_JAVA */
-#define CUPS_JAVA      ""
-/* #undef HAVE_PERL */
-#define CUPS_PERL      ""
-/* #undef HAVE_PHP */
-#define CUPS_PHP       ""
-/* #undef HAVE_PYTHON */
-#define CUPS_PYTHON    ""
-
-
-/*
- * Do we have CoreFoundation public and private headers?
+ * Do we have CoreFoundation public headers?
  */
 
 /* #undef HAVE_COREFOUNDATION_H */
-/* #undef HAVE_CFPRIV_H */
-/* #undef HAVE_CFBUNDLEPRIV_H */
 
 
 /*
@@ -611,7 +587,6 @@ typedef unsigned long useconds_t;
  */
 
 /* #undef HAVE_MEMBERSHIP_H */
-/* #undef HAVE_MEMBERSHIPPRIV_H */
 /* #undef HAVE_MBR_UID_TO_UUID */
 
 
@@ -706,7 +681,7 @@ typedef unsigned long useconds_t;
 
 #ifdef HAVE_ARC4RANDOM
 #  define CUPS_RAND() arc4random()
-#  define CUPS_SRAND(v) arc4random_stir()
+#  define CUPS_SRAND(v)
 #elif defined(HAVE_RANDOM)
 #  define CUPS_RAND() random()
 #  define CUPS_SRAND(v) srandom(v)
@@ -719,13 +694,6 @@ typedef unsigned long useconds_t;
 #endif /* HAVE_ARC4RANDOM */
 
 
-/*
- * Do we have vproc_transaction_begin/end?
- */
-
-/* #undef HAVE_VPROC_TRANSACTION_BEGIN */
-
-
 /*
  * Do we have libusb?
  */
@@ -771,14 +739,6 @@ typedef unsigned long useconds_t;
  */
 
 /* #undef HAVE_XPC */
-/* #undef HAVE_XPC_PRIVATE_H */
-
-
-/*
- * Do we have Mini-XML?
- */
-
-/* #undef HAVE_MXML_H */
 
 
 /*