Merge changes from CUPS 1.5svn-r9641

[thirdparty/cups.git] / cups / dir.h

diff --git a/cups/dir.h b/cups/dir.h
index caa05713e300b38f8792a98ea19fd60bbdcf8453..85dd8076ac468dbd001eac45b19256b60dcf0914 100644 (file)
--- a/cups/dir.h
+++ b/cups/dir.h
@@ -1,27 +1,18 @@
 /*
- * "$Id: dir.h 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $"
  *
  *   Public directory definitions for the Common UNIX Printing System (CUPS).
  *
  *   This set of APIs abstracts enumeration of directory entries.
  *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
  */
 
 #ifndef _CUPS_DIR_H_
@@ -32,6 +23,7 @@
  * Include necessary headers...
  */
 
+#  include "versioning.h"
 #  include <sys/stat.h>
 
 
@@ -39,9 +31,9 @@
  * C++ magic...
  */
 
-#  ifdef _cplusplus
+#  ifdef __cplusplus
 extern "C" {
-#  endif /* _cplusplus */
+#  endif /* __cplusplus */
 
 
 /*
@@ -61,17 +53,17 @@ typedef struct cups_dentry_s                /**** Directory entry type ****/
  * Prototypes...
  */
 
-extern void            cupsDirClose(cups_dir_t *dp);
-extern cups_dir_t      *cupsDirOpen(const char *directory);
-extern cups_dentry_t   *cupsDirRead(cups_dir_t *dp);
-extern void            cupsDirRewind(cups_dir_t *dp);
+extern void            cupsDirClose(cups_dir_t *dp) _CUPS_API_1_2;
+extern cups_dir_t      *cupsDirOpen(const char *directory) _CUPS_API_1_2;
+extern cups_dentry_t   *cupsDirRead(cups_dir_t *dp) _CUPS_API_1_2;
+extern void            cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2;
 
 
-#  ifdef _cplusplus
+#  ifdef __cplusplus
 }
-#  endif /* _cplusplus */
+#  endif /* __cplusplus */
 #endif /* !_CUPS_DIR_H_ */
 
 /*
- * End of "$Id: dir.h 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $".
  */