[svn] GnuPG - r4481 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2007-04-16 23:55:53 +0200 (Mon, 16 Apr 2007)
New Revision: 4481

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/gpg.c
   branches/STABLE-BRANCH-1-4/g10/pkclist.c
Log:
* gpg.c, pkclist.c: #include <strings.h> for strcasecmp if it is
present.  Note that autoconf protects us against a strings.h that
cannot be used together with string.h.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-04-16 18:57:23 UTC (rev 4480)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-04-16 21:55:53 UTC (rev 4481)
@@ -1,3 +1,9 @@
+2007-04-16  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.c, pkclist.c: #include <strings.h> for strcasecmp if it is
+	present.  Note that autoconf protects us against a strings.h that
+	cannot be used together with string.h.
+
 2007-04-03  David Shaw  <dshaw at jabberwocky.com>
 
 	* parse-packet.c (parse_marker): New.  Enforce that the marker

Modified: branches/STABLE-BRANCH-1-4/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/gpg.c	2007-04-16 18:57:23 UTC (rev 4480)
+++ branches/STABLE-BRANCH-1-4/g10/gpg.c	2007-04-16 21:55:53 UTC (rev 4481)
@@ -1,6 +1,6 @@
 /* gpg.c - The GnuPG utility (main for gpg)
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -25,6 +25,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #include <ctype.h>
 #include <unistd.h>
 #include <assert.h>

Modified: branches/STABLE-BRANCH-1-4/g10/pkclist.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/pkclist.c	2007-04-16 18:57:23 UTC (rev 4480)
+++ branches/STABLE-BRANCH-1-4/g10/pkclist.c	2007-04-16 21:55:53 UTC (rev 4481)
@@ -1,6 +1,6 @@
 /* pkclist.c
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -24,6 +24,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #include <errno.h>
 #include <assert.h>