Merge changes from CUPS 1.5b1-r9798.

[thirdparty/cups.git] / cups / page.c

diff --git a/cups/page.c b/cups/page.c
index e8214661653d67149154142df10fa3f21fd17945..8e79889ab773b04a666ca9b2d8695d67ce328978 100644 (file)
--- a/cups/page.c
+++ b/cups/page.c
@@ -3,7 +3,7 @@
  *
  *   Page size functions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -96,27 +96,27 @@ ppdPageSize(ppd_file_t *ppd,                /* I - PPD file record */
       if (!nameptr)
         return (NULL);
 
-      if (!strcasecmp(nameptr, "in"))
+      if (!_cups_strcasecmp(nameptr, "in"))
       {
         w *= 72.0;
        l *= 72.0;
       }
-      else if (!strcasecmp(nameptr, "ft"))
+      else if (!_cups_strcasecmp(nameptr, "ft"))
       {
         w *= 12.0 * 72.0;
        l *= 12.0 * 72.0;
       }
-      else if (!strcasecmp(nameptr, "mm"))
+      else if (!_cups_strcasecmp(nameptr, "mm"))
       {
         w *= 72.0 / 25.4;
         l *= 72.0 / 25.4;
       }
-      else if (!strcasecmp(nameptr, "cm"))
+      else if (!_cups_strcasecmp(nameptr, "cm"))
       {
         w *= 72.0 / 2.54;
         l *= 72.0 / 2.54;
       }
-      else if (!strcasecmp(nameptr, "m"))
+      else if (!_cups_strcasecmp(nameptr, "m"))
       {
         w *= 72.0 / 0.0254;
         l *= 72.0 / 0.0254;
@@ -158,7 +158,7 @@ ppdPageSize(ppd_file_t *ppd,                /* I - PPD file record */
       */
 
       for (i = ppd->num_sizes, size = ppd->sizes; i > 0; i --, size ++)
-       if (!strcasecmp(name, size->name))
+       if (!_cups_strcasecmp(name, size->name))
        {
          DEBUG_printf(("3ppdPageSize: Returning %p (\"%s\", %gx%g)", size,
                        size->name, size->width, size->length));