Merge changes from CUPS 1.4svn-r8329.

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

diff --git a/cups/string.h b/cups/string.h
index e9a44ee8c3b8832d3304229d29ea647301538615..99e3d5855e7db562671c3cd66d817a3664aed9cc 100644 (file)
--- a/cups/string.h
+++ b/cups/string.h
@@ -3,7 +3,7 @@
  *
  *   String definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -66,8 +66,13 @@ extern "C" {
  * String pool structures...
  */
 
+#  define _CUPS_STR_GUARD      0x12344321
+
 typedef struct _cups_sp_item_s         /**** String Pool Item ****/
 {
+#  ifdef DEBUG_GUARDS
+  unsigned int guard;                  /* Guard word */
+#  endif /* DEBUG_GUARDS */
   unsigned int ref_count;              /* Reference count */
   char         str[1];                 /* String */
 } _cups_sp_item_t;