Remove all of the Subversion keywords from various source files.

[thirdparty/cups.git] / backend / backend-private.h

diff --git a/backend/backend-private.h b/backend/backend-private.h
index 47f9b32ce740c479c0618b4390b55d007de2a618..04bf5167405d4f5918ec2cac1e3f6b0771957d73 100644 (file)
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -1,18 +1,16 @@
 /*
- * "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $"
+ * Backend support definitions for CUPS.
  *
- *   Backend support definitions for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2010 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * 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"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   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"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_BACKEND_PRIVATE_H_
@@ -259,6 +257,20 @@ extern "C" {
 #define CUPS_TC_inserts                                33
 #define CUPS_TC_covers                         34
 
+#define CUPS_TC_tenThousandthsOfInches         3
+#define CUPS_TC_micrometers                    4
+#define CUPS_TC_impressions                    7
+#define CUPS_TC_sheets                         8
+#define CUPS_TC_hours                          11
+#define CUPS_TC_thousandthsOfOunces            12
+#define CUPS_TC_tenthsOfGrams                  13
+#define CUPS_TC_hundrethsOfFluidOunces         14
+#define CUPS_TC_tenthsOfMilliliters            15
+#define CUPS_TC_feet                           16
+#define CUPS_TC_meters                         17
+#define CUPS_TC_items                          18
+#define CUPS_TC_percent                                19
+
 /* These come from RFC 3808 to define character sets we support */
 /* Also see http://www.iana.org/assignments/character-sets */
 #define CUPS_TC_csASCII                                3
@@ -274,6 +286,7 @@ extern "C" {
 #define CUPS_TC_csUTF32                                1017
 #define CUPS_TC_csUTF32BE                      1018
 #define CUPS_TC_csUTF32LE                      1019
+#define CUPS_TC_csWindows31J                   2024
 
 
 /*
@@ -298,7 +311,7 @@ extern int          backendGetDeviceID(int fd, char *device_id,
                                           int uri_size);
 extern int             backendGetMakeModel(const char *device_id,
                                            char *make_model,
-                                           int make_model_size);
+                                           size_t make_model_size);
 extern int             backendNetworkSideCB(int print_fd, int device_fd,
                                             int snmp_fd, http_addr_t *addr,
                                             int use_bc);
@@ -309,15 +322,10 @@ extern int                backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
                                            int *page_count,
                                            int *printer_state);
 extern int             backendWaitLoop(int snmp_fd, http_addr_t *addr,
-                                       _cups_sccb_t side_cb);
+                                       int use_bc, _cups_sccb_t side_cb);
 
 
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
 #endif /* !_CUPS_BACKEND_PRIVATE_H_ */
-
-
-/*
- * End of "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $".
- */