Bump to cups 2.3.3

[platform/upstream/cups.git] / scheduler / mime.c

diff --git a/scheduler/mime.c b/scheduler/mime.c
index 29d3ebc..d60d4ef 100644 (file)
--- a/scheduler/mime.c
+++ b/scheduler/mime.c
@@ -1,16 +1,10 @@
 /*
- * "$Id: mime.c 11558 2014-02-06 18:33:34Z msweet $"
- *
  * MIME database file routines for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
  * Copyright 1997-2006 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"
- * 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.
  */
 
 /*
@@ -18,12 +12,19 @@
  */
 
 #include <cups/string-private.h>
-#include <cups/debug-private.h>
 #include <cups/dir.h>
 #include "mime-private.h"
 
 
 /*
+ * Debug macros that used to be private API...
+ */
+
+#define DEBUG_puts(x)
+#define DEBUG_printf(...)
+
+
+/*
  * Local types...
  */
 
@@ -932,8 +933,3 @@ mime_load_types(mime_t     *mime,   /* I - MIME database */
 
   cupsFileClose(fp);
 }
-
-
-/*
- * End of "$Id: mime.c 11558 2014-02-06 18:33:34Z msweet $".
- */