Miscellaneous build fixes for NetBSD (STR #788)

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

diff --git a/cups/string.h b/cups/string.h
index ad2b7eaa7c1a62070ae04cd4c8c29d4dc373dec6..b39479720a511b872997f5eda5498e6263c5ae1f 100644 (file)
--- a/cups/string.h
+++ b/cups/string.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: string.h,v 1.11 2002/03/01 19:53:30 mike Exp $"
+ * "$Id: string.h,v 1.18 2004/06/29 03:44:52 mike Exp $"
  *
  *   String definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2002 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -45,6 +45,10 @@
 #    include <strings.h>
 #  endif /* HAVE_STRINGS_H */
 
+#  ifdef HAVE_BSTRING_H
+#    include <bstring.h>
+#  endif /* HAVE_BSTRING_H */
+
 
 /*
  * Stuff for WIN32 and OS/2...
@@ -69,24 +73,45 @@ extern "C" {
  * Prototypes...
  */
 
+extern void    cups_strcpy(char *dst, const char *src);
+
 #  ifndef HAVE_STRDUP
-extern char    *strdup(const char *);
+extern char    *cups_strdup(const char *);
+#    define strdup cups_strdup
 #  endif /* !HAVE_STRDUP */
 
 #  ifndef HAVE_STRCASECMP
-extern int     strcasecmp(const char *, const char *);
+extern int     cups_strcasecmp(const char *, const char *);
+#    define strcasecmp cups_strcasecmp
 #  endif /* !HAVE_STRCASECMP */
 
 #  ifndef HAVE_STRNCASECMP
-extern int     strncasecmp(const char *, const char *, size_t n);
+extern int     cups_strncasecmp(const char *, const char *, size_t n);
+#    define strncasecmp cups_strncasecmp
 #  endif /* !HAVE_STRNCASECMP */
 
+#  ifndef HAVE_STRLCAT
+extern size_t cups_strlcat(char *, const char *, size_t);
+#    define strlcat cups_strlcat
+#  endif /* !HAVE_STRLCAT */
+
+#  ifndef HAVE_STRLCPY
+extern size_t cups_strlcpy(char *, const char *, size_t);
+#    define strlcpy cups_strlcpy
+#  endif /* !HAVE_STRLCPY */
+
 #  ifndef HAVE_SNPRINTF
-extern int     snprintf(char *, size_t, const char *, ...);
+extern int     cups_snprintf(char *, size_t, const char *, ...)
+#    ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 3, 4)))
+#    endif /* __GNUC__ */
+;
+#    define snprintf cups_snprintf
 #  endif /* !HAVE_SNPRINTF */
 
 #  ifndef HAVE_VSNPRINTF
-extern int     vsnprintf(char *, size_t, const char *, va_list);
+extern int     cups_vsnprintf(char *, size_t, const char *, va_list);
+#    define vsnprintf cups_vsnprintf
 #  endif /* !HAVE_VSNPRINTF */
 
 
@@ -101,5 +126,5 @@ extern int  vsnprintf(char *, size_t, const char *, va_list);
 #endif /* !_CUPS_STRING_H_ */
 
 /*
- * End of "$Id: string.h,v 1.11 2002/03/01 19:53:30 mike Exp $".
+ * End of "$Id: string.h,v 1.18 2004/06/29 03:44:52 mike Exp $".
  */