string.h was freely included in many modules, so it seems pointless to

ifdef it in others. (I could've gone the other way with this -- adding the ifdef where absent -- but I don't know what it would achieve. More support for those hypothetical pre-ANSI compilers?)
2026-09-24 07:45:21 +00:00 · 2006-01-12 06:56:25 +00:00
parent 04950b45c6
commit ef7c98ea3f
10 changed files with 23 additions and 65 deletions
--- a/curses.h
+++ b/curses.h
@@ -18,7 +18,7 @@
 ***************************************************************************
 */
 /*
-$Id: curses.h,v 1.73 2006/01/12 06:45:43 wmcbrine Exp $
+$Id: curses.h,v 1.74 2006/01/12 06:56:25 wmcbrine Exp $
 */
 /*
 *----------------------------------------------------------------------
@@ -232,9 +232,6 @@ PDCurses portable platform definitions list:
 #  ifndef HAVE_STDARG_H
 #    define HAVE_STDARG_H                           /* have <stdarg.h> */
 #  endif
-#  ifndef HAVE_STRING_H
-#    define HAVE_STRING_H
-#  endif
 #  ifndef HAVE_MEMMOVE
 #    define HAVE_MEMMOVE                             /* have memmove() */
 #  endif
@@ -409,9 +406,6 @@ PDCurses portable platform definitions list:
 #  ifndef HAVE_STDARG_H
 #    define HAVE_STDARG_H                           /* have <stdarg.h> */
 #  endif
-#  ifndef HAVE_STRING_H
-#    define HAVE_STRING_H
-#  endif
 #  ifndef HAVE_LIMITS_H
 #    define HAVE_LIMITS_H                           /* have <limits.h> */
 #  endif
@@ -458,9 +452,6 @@ PDCurses portable platform definitions list:
 #  ifndef HAVE_STDARG_H
 #    define HAVE_STDARG_H                           /* have <stdarg.h> */
 #  endif
-#  ifndef HAVE_STRING_H
-#    define HAVE_STRING_H
-#  endif
 #  ifndef HAVE_LIMITS_H
 #    define HAVE_LIMITS_H                           /* have <limits.h> */
 #  endif
@@ -511,9 +502,6 @@ PDCurses portable platform definitions list:
 #  ifndef HAVE_STDARG_H
 #    define HAVE_STDARG_H                           /* have <stdarg.h> */
 #  endif
-#  ifndef HAVE_STRING_H
-#    define HAVE_STRING_H
-#  endif
 #  ifndef HAVE_UNISTD_H
 #    define HAVE_UNISTD_H                           /* have <unistd.h> */
 #  endif
@@ -545,9 +533,6 @@ PDCurses portable platform definitions list:
 #  ifndef HAVE_LIMITS_H
 #    define HAVE_LIMITS_H                           /* have <limits.h> */
 #  endif
-#  ifndef HAVE_STRING_H                             /* have <string.h> */
-#    define HAVE_STRING_H
-#  endif
 #  ifndef HAVE_MEMORY_H
 #    define HAVE_MEMORY_H                           /* have <memory.h> */
 #  endif
@@ -579,9 +564,6 @@ PDCurses portable platform definitions list:
 #  ifndef HAVE_LIMITS_H
 #    define HAVE_LIMITS_H                           /* have <limits.h> */
 #  endif
-#  ifndef HAVE_STRING_H                             /* have <string.h> */
-#    define HAVE_STRING_H
-#  endif
 #  ifndef HAVE_MEMORY_H
 #    define HAVE_MEMORY_H                           /* have <memory.h> */
 #  endif
@@ -666,9 +648,6 @@ PDCurses portable platform definitions list:
 #  ifndef HAVE_STDARG_H
 #    define HAVE_STDARG_H                           /* have <stdarg.h> */
 #  endif
-#  ifndef HAVE_STRING_H
-#    define HAVE_STRING_H
-#  endif
 #  ifndef HAVE_MEMMOVE
 #    define HAVE_MEMMOVE                             /* have memmove() */
 #  endif
--- a/os2/pdcsetsc.c
+++ b/os2/pdcsetsc.c
@@ -22,13 +22,10 @@
 # include <config.h>
 #endif
 #include <curses.h>
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 #ifdef PDCDEBUG
-char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.7 2006/01/08 11:53:42 wmcbrine Exp $";
+char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.8 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************
--- a/pdcurses/addchstr.c
+++ b/pdcurses/addchstr.c
@@ -22,10 +22,7 @@
 # include <config.h>
 #endif
 #include <curses.h>
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 /* undefine any macros for functions defined in this module */
 #undef   addchstr
@@ -44,7 +41,7 @@
 #endif

 #ifdef PDCDEBUG
-char *rcsid_addchstr  = "$Id: addchstr.c,v 1.8 2006/01/06 10:32:16 wmcbrine Exp $";
+char *rcsid_addchstr  = "$Id: addchstr.c,v 1.9 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************
--- a/pdcurses/color.c
+++ b/pdcurses/color.c
@@ -22,10 +22,7 @@
 # include <config.h>
 #endif
 #include <curses.h>
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 /* undefine any macros for functions defined in this module */
 #undef	start_color
@@ -48,7 +45,7 @@ static void PDC_init_pair();
 #endif

 #ifdef PDCDEBUG
-char *rcsid_color = "$Id: color.c,v 1.16 2006/01/04 13:39:34 wmcbrine Exp $";
+char *rcsid_color = "$Id: color.c,v 1.17 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************
--- a/pdcurses/insstr.c
+++ b/pdcurses/insstr.c
@@ -22,10 +22,7 @@
 # include <config.h>
 #endif
 #include <curses.h>
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 /* undefine any macros for functions defined in this module */
 #undef	insstr
@@ -46,7 +43,7 @@
 #endif

 #ifdef PDCDEBUG
-char *rcsid_insstr  = "$Id: insstr.c,v 1.6 2006/01/06 10:32:16 wmcbrine Exp $";
+char *rcsid_insstr  = "$Id: insstr.c,v 1.7 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************
--- a/pdcurses/kernel.c
+++ b/pdcurses/kernel.c
@@ -26,9 +26,7 @@
 #endif
 #include <curses.h>

-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 #ifdef HAVE_MEMORY_H
 # include <memory.h>
@@ -80,7 +78,7 @@
 #endif

 #ifdef PDCDEBUG
-char *rcsid_kernel = "$Id: kernel.c,v 1.20 2006/01/06 10:32:16 wmcbrine Exp $";
+char *rcsid_kernel = "$Id: kernel.c,v 1.21 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 RIPPEDOFFLINE linesripped[5];
--- a/pdcurses/mouse.c
+++ b/pdcurses/mouse.c
@@ -22,10 +22,7 @@
 # include <config.h>
 #endif
 #include <curses.h>
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 /* undefine any macros for functions defined in this module */
 #undef	mouse_set
@@ -42,7 +39,7 @@
 #endif

 #ifdef PDCDEBUG
-char *rcsid_mouse = "$Id: mouse.c,v 1.4 2006/01/06 10:32:16 wmcbrine Exp $";
+char *rcsid_mouse = "$Id: mouse.c,v 1.5 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************
--- a/pdcurses/pdcutil.c
+++ b/pdcurses/pdcutil.c
@@ -31,22 +31,20 @@
 #include <stdio.h>

 #ifdef HAVE_LIMITS_H
-#  include <limits.h>
+# include <limits.h>
 #endif

-#ifdef HAVE_STRING_H
-#  include <string.h>
-#endif
+#include <string.h>

 #if defined(HAVE_STDARG_H) && defined(HAVE_PROTO)
-#  include <stdarg.h>
-#  define HAVE_STDARG_H_HAVE_PROTO
+# include <stdarg.h>
+# define HAVE_STDARG_H_HAVE_PROTO
 #else
-#  include <varargs.h>
+# include <varargs.h>
 #endif

 #ifdef PDCDEBUG
-char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.12 2006/01/06 10:32:16 wmcbrine Exp $";
+char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.13 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************
--- a/pdcurses/pdcwin.c
+++ b/pdcurses/pdcwin.c
@@ -27,16 +27,14 @@
 # include <memory.h>
 #endif

-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>

 #ifndef HAVE_MEMMOVE
 # define memmove PDC_memmove
 #endif

 #ifdef PDCDEBUG
-char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.11 2006/01/06 10:32:16 wmcbrine Exp $";
+char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.12 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************
--- a/pdcurses/refresh.c
+++ b/pdcurses/refresh.c
@@ -26,7 +26,7 @@
 #include <string.h>

 #ifdef HAVE_MEMORY_H
-#include <memory.h>
+# include <memory.h>
 #endif

 /* undefine any macros for functions defined in this module */
@@ -48,7 +48,7 @@
 #endif

 #ifdef PDCDEBUG
-char *rcsid_refresh = "$Id: refresh.c,v 1.7 2006/01/12 06:45:43 wmcbrine Exp $";
+char *rcsid_refresh = "$Id: refresh.c,v 1.8 2006/01/12 06:56:25 wmcbrine Exp $";
 #endif

 /*man-start*********************************************************************