Remove obsolete memory.h include.

diff --git a/lib/util/inet_pton.c b/lib/util/inet_pton.c
index 62582c39474accc428635e357b3301d99df364e6..ba3ec61580c490e92692242d630be0673d4559d3 100644 (file)
--- a/lib/util/inet_pton.c
+++ b/lib/util/inet_pton.c
@@ -26,9 +26,6 @@
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/key_val.c b/lib/util/key_val.c
index ef034aa31613b7d515090740d03a721edc70142b..bd641e3cc909fbfff8e0451d098b4e29870419b7 100644 (file)
--- a/lib/util/key_val.c
+++ b/lib/util/key_val.c
@@ -28,9 +28,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c
index 6cda4b6d51c7abb3cc7292faa37de04b7e4cbfc1..efe3129198edd0d08157b02cdfc3abe9e92b4f6c 100644 (file)
--- a/lib/util/lbuf.c
+++ b/lib/util/lbuf.c
@@ -29,9 +29,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/locking.c b/lib/util/locking.c
index 23922966a1a551f205720526f57ed3198171a1da..4daec57fd666038b6abc7105279a2cae38b37d0c 100644 (file)
--- a/lib/util/locking.c
+++ b/lib/util/locking.c
@@ -34,9 +34,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/parseln.c b/lib/util/parseln.c
index d586ff4f13b25976adde7a64aacdf042bff42f40..30f7d5e645f23cf33277d8d49258da282820dfe1 100644 (file)
--- a/lib/util/parseln.c
+++ b/lib/util/parseln.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/regress/parse_gids/parse_gids_test.c b/lib/util/regress/parse_gids/parse_gids_test.c
index 5a697f01f13efe53d732e659f79ed0fc5ba6ade1..1ed8847c60c8079f582e4cf54eeb2c6e08d67297 100644 (file)
--- a/lib/util/regress/parse_gids/parse_gids_test.c
+++ b/lib/util/regress/parse_gids/parse_gids_test.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/regress/progname/progname_test.c b/lib/util/regress/progname/progname_test.c
index 6045fb30049cb8dfb15ae30c18fe154661b93355..95338554ce18dc7b02efc4072d77962a8d8904ed 100644 (file)
--- a/lib/util/regress/progname/progname_test.c
+++ b/lib/util/regress/progname/progname_test.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/regress/strsplit/strsplit_test.c b/lib/util/regress/strsplit/strsplit_test.c
index ad46fb263f6f8c1b908b2875a95c1484a7ca6277..fd2ecd16a99a388f44395550c44122ecaf58c3bd 100644 (file)
--- a/lib/util/regress/strsplit/strsplit_test.c
+++ b/lib/util/regress/strsplit/strsplit_test.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/regress/sudo_conf/conf_test.c b/lib/util/regress/sudo_conf/conf_test.c
index 94cf5af7789610375d2add8da62d30d29c42a0b2..4b7cd10c4bb391fdbfaa5dc62371400854ab1d28 100644 (file)
--- a/lib/util/regress/sudo_conf/conf_test.c
+++ b/lib/util/regress/sudo_conf/conf_test.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/regress/sudo_parseln/parseln_test.c b/lib/util/regress/sudo_parseln/parseln_test.c
index 2254848fabd2c624a26b7e174b773626a76e4ba7..549ef19bdb8487ed2c8e5ce46ddaa7c9ce8cf0ee 100644 (file)
--- a/lib/util/regress/sudo_parseln/parseln_test.c
+++ b/lib/util/regress/sudo_parseln/parseln_test.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/regress/tailq/hltq_test.c b/lib/util/regress/tailq/hltq_test.c
index 7b5731fac905e2ec3364d1fc9189a9be549073db..353370a9a8811a99c6d99c3cc29de4377ea1b110 100644 (file)
--- a/lib/util/regress/tailq/hltq_test.c
+++ b/lib/util/regress/tailq/hltq_test.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/sha2.c b/lib/util/sha2.c
index 0a85c9742b8f83832040ecd24479451b8778ca41..c2b2a2a89581e19f1136513ccf99fd7ec9512a23 100644 (file)
--- a/lib/util/sha2.c
+++ b/lib/util/sha2.c
@@ -36,9 +36,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/snprintf.c b/lib/util/snprintf.c
index 3fcf85ecabb65bb13db589bec6e4ccf9b3ff52d4..b8c797e1c42efcffb24e0f213ceb2635335003ba 100644 (file)
--- a/lib/util/snprintf.c
+++ b/lib/util/snprintf.c
@@ -69,9 +69,6 @@
 #endif
 #include <stdio.h>
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/strtobool.c b/lib/util/strtobool.c
index 9d5fdc07733e49b8b121f8d6845372185549ab60..f1ac2bc5eb0d42005c43c2e5ae84f7fb240536fc 100644 (file)
--- a/lib/util/strtobool.c
+++ b/lib/util/strtobool.c
@@ -28,9 +28,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/lib/util/term.c b/lib/util/term.c
index 115576226d2442acc17035cb2e06df306716c923..ef775b704102e37eb57d12ed5ed704816132b7c4 100644 (file)
--- a/lib/util/term.c
+++ b/lib/util/term.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/group_file/getgrent.c b/plugins/group_file/getgrent.c
index f70130ee668f82425d325a0555387912ca047a39..e8af8177068310cda160224a492df29b3f984614 100644 (file)
--- a/plugins/group_file/getgrent.c
+++ b/plugins/group_file/getgrent.c
@@ -31,9 +31,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/group_file/group_file.c b/plugins/group_file/group_file.c
index 9e7a2d5d7b062192129250b9518e64c21bbc7334..6f1df92ea40cc05362b0e0f4e233292419c82290 100644 (file)
--- a/plugins/group_file/group_file.c
+++ b/plugins/group_file/group_file.c
@@ -34,9 +34,6 @@
 # include "compat/stdbool.h"
 #endif /* HAVE_STDBOOL_H */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c
index 32a3f5da951f95f762d612511048bc83351af2ce..75c795b43de7c9919b24b21f6f19a25ee084c13f 100644 (file)
--- a/plugins/sample/sample_plugin.c
+++ b/plugins/sample/sample_plugin.c
@@ -35,9 +35,6 @@
 # include "compat/stdbool.h"
 #endif /* HAVE_STDBOOL_H */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/boottime.c b/plugins/sudoers/boottime.c
index ed3664419b402cf37524575e7cdfd42bb0c952c2..e1706fc789c25f2fc17f6241c64c14a062d1783f 100644 (file)
--- a/plugins/sudoers/boottime.c
+++ b/plugins/sudoers/boottime.c
@@ -34,9 +34,6 @@
 # include "compat/stdbool.h"
 #endif /* HAVE_STDBOOL_H */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/editor.c b/plugins/sudoers/editor.c
index 8eee62d64c864aa76bde1b262942056d3d9ed324..5a3e60475f1e788418290b147b24169c95abed86 100644 (file)
--- a/plugins/sudoers/editor.c
+++ b/plugins/sudoers/editor.c
@@ -28,9 +28,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/getdate.c b/plugins/sudoers/getdate.c
index e0e521caa66ee49a0bd07997d105123b8f006c5f..984253629060a48cb5deccff383b03e55d9d7d85 100644 (file)
--- a/plugins/sudoers/getdate.c
+++ b/plugins/sudoers/getdate.c
@@ -38,9 +38,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H
@@ -120,7 +117,7 @@ static int  yyerror(const char *s);
 static int     yylex(void);
        int     yyparse(void);
 
-#line 113 "getdate.y"
+#line 110 "getdate.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -128,7 +125,7 @@ typedef union {
     enum _MERIDIAN     Meridian;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 131 "getdate.c"
+#line 128 "getdate.c"
 #define tAGO 257
 #define tDAY 258
 #define tDAYZONE 259
@@ -396,7 +393,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 unsigned int yystacksize;
-#line 332 "getdate.y"
+#line 329 "getdate.y"
 
 /* Month and day table. */
 static TABLE const MonthDayTable[] = {
@@ -1018,7 +1015,7 @@ main(int argc, char *argv[])
     /* NOTREACHED */
 }
 #endif /* TEST */
-#line 969 "getdate.c"
+#line 966 "getdate.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1227,37 +1224,37 @@ yyreduce:
     switch (yyn)
     {
 case 3:
-#line 131 "getdate.y"
+#line 128 "getdate.y"
 {
            yyHaveTime++;
        }
 break;
 case 4:
-#line 134 "getdate.y"
+#line 131 "getdate.y"
 {
            yyHaveZone++;
        }
 break;
 case 5:
-#line 137 "getdate.y"
+#line 134 "getdate.y"
 {
            yyHaveDate++;
        }
 break;
 case 6:
-#line 140 "getdate.y"
+#line 137 "getdate.y"
 {
            yyHaveDay++;
        }
 break;
 case 7:
-#line 143 "getdate.y"
+#line 140 "getdate.y"
 {
            yyHaveRel++;
        }
 break;
 case 9:
-#line 149 "getdate.y"
+#line 146 "getdate.y"
 {
            yyHour = yyvsp[-1].Number;
            yyMinutes = 0;
@@ -1266,7 +1263,7 @@ case 9:
        }
 break;
 case 10:
-#line 155 "getdate.y"
+#line 152 "getdate.y"
 {
            yyHour = yyvsp[-3].Number;
            yyMinutes = yyvsp[-1].Number;
@@ -1275,7 +1272,7 @@ case 10:
        }
 break;
 case 11:
-#line 161 "getdate.y"
+#line 158 "getdate.y"
 {
            yyHour = yyvsp[-3].Number;
            yyMinutes = yyvsp[-1].Number;
@@ -1285,7 +1282,7 @@ case 11:
        }
 break;
 case 12:
-#line 168 "getdate.y"
+#line 165 "getdate.y"
 {
            yyHour = yyvsp[-5].Number;
            yyMinutes = yyvsp[-3].Number;
@@ -1294,7 +1291,7 @@ case 12:
        }
 break;
 case 13:
-#line 174 "getdate.y"
+#line 171 "getdate.y"
 {
            yyHour = yyvsp[-5].Number;
            yyMinutes = yyvsp[-3].Number;
@@ -1305,56 +1302,56 @@ case 13:
        }
 break;
 case 14:
-#line 184 "getdate.y"
+#line 181 "getdate.y"
 {
            yyTimezone = yyvsp[0].Number;
            yyDSTmode = DSToff;
        }
 break;
 case 15:
-#line 188 "getdate.y"
+#line 185 "getdate.y"
 {
            yyTimezone = yyvsp[0].Number;
            yyDSTmode = DSTon;
        }
 break;
 case 16:
-#line 193 "getdate.y"
+#line 190 "getdate.y"
 {
            yyTimezone = yyvsp[-1].Number;
            yyDSTmode = DSTon;
        }
 break;
 case 17:
-#line 199 "getdate.y"
+#line 196 "getdate.y"
 {
            yyDayOrdinal = 1;
            yyDayNumber = yyvsp[0].Number;
        }
 break;
 case 18:
-#line 203 "getdate.y"
+#line 200 "getdate.y"
 {
            yyDayOrdinal = 1;
            yyDayNumber = yyvsp[-1].Number;
        }
 break;
 case 19:
-#line 207 "getdate.y"
+#line 204 "getdate.y"
 {
            yyDayOrdinal = yyvsp[-1].Number;
            yyDayNumber = yyvsp[0].Number;
        }
 break;
 case 20:
-#line 213 "getdate.y"
+#line 210 "getdate.y"
 {
            yyMonth = yyvsp[-2].Number;
            yyDay = yyvsp[0].Number;
        }
 break;
 case 21:
-#line 217 "getdate.y"
+#line 214 "getdate.y"
 {
            if (yyvsp[-4].Number >= 100) {
                yyYear = yyvsp[-4].Number;
@@ -1368,7 +1365,7 @@ case 21:
        }
 break;
 case 22:
-#line 228 "getdate.y"
+#line 225 "getdate.y"
 {
            /* ISO 8601 format.  yyyy-mm-dd.  */
            yyYear = yyvsp[-2].Number;
@@ -1377,7 +1374,7 @@ case 22:
        }
 break;
 case 23:
-#line 234 "getdate.y"
+#line 231 "getdate.y"
 {
            /* e.g. 17-JUN-1992.  */
            yyDay = yyvsp[-2].Number;
@@ -1386,14 +1383,14 @@ case 23:
        }
 break;
 case 24:
-#line 240 "getdate.y"
+#line 237 "getdate.y"
 {
            yyMonth = yyvsp[-1].Number;
            yyDay = yyvsp[0].Number;
        }
 break;
 case 25:
-#line 244 "getdate.y"
+#line 241 "getdate.y"
 {
            yyMonth = yyvsp[-3].Number;
            yyDay = yyvsp[-2].Number;
@@ -1401,14 +1398,14 @@ case 25:
        }
 break;
 case 26:
-#line 249 "getdate.y"
+#line 246 "getdate.y"
 {
            yyMonth = yyvsp[0].Number;
            yyDay = yyvsp[-1].Number;
        }
 break;
 case 27:
-#line 253 "getdate.y"
+#line 250 "getdate.y"
 {
            yyMonth = yyvsp[-1].Number;
            yyDay = yyvsp[-2].Number;
@@ -1416,68 +1413,68 @@ case 27:
        }
 break;
 case 28:
-#line 260 "getdate.y"
+#line 257 "getdate.y"
 {
            yyRelSeconds = -yyRelSeconds;
            yyRelMonth = -yyRelMonth;
        }
 break;
 case 30:
-#line 267 "getdate.y"
+#line 264 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
        }
 break;
 case 31:
-#line 270 "getdate.y"
+#line 267 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
        }
 break;
 case 32:
-#line 273 "getdate.y"
+#line 270 "getdate.y"
 {
            yyRelSeconds += yyvsp[0].Number * 60L;
        }
 break;
 case 33:
-#line 276 "getdate.y"
+#line 273 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number;
        }
 break;
 case 34:
-#line 279 "getdate.y"
+#line 276 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number;
        }
 break;
 case 35:
-#line 282 "getdate.y"
+#line 279 "getdate.y"
 {
            yyRelSeconds++;
        }
 break;
 case 36:
-#line 285 "getdate.y"
+#line 282 "getdate.y"
 {
            yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
        }
 break;
 case 37:
-#line 288 "getdate.y"
+#line 285 "getdate.y"
 {
            yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
        }
 break;
 case 38:
-#line 291 "getdate.y"
+#line 288 "getdate.y"
 {
            yyRelMonth += yyvsp[0].Number;
        }
 break;
 case 39:
-#line 296 "getdate.y"
+#line 293 "getdate.y"
 {
            if (yyHaveTime && yyHaveDate && !yyHaveRel)
                yyYear = yyvsp[0].Number;
@@ -1505,18 +1502,18 @@ case 39:
        }
 break;
 case 40:
-#line 323 "getdate.y"
+#line 320 "getdate.y"
 {
            yyval.Meridian = MER24;
        }
 break;
 case 41:
-#line 326 "getdate.y"
+#line 323 "getdate.y"
 {
            yyval.Meridian = yyvsp[0].Meridian;
        }
 break;
-#line 1467 "getdate.c"
+#line 1464 "getdate.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/plugins/sudoers/getdate.y b/plugins/sudoers/getdate.y
index e9b91f377a683349d57d8703ff026bb3c8a42d3f..cd32b94498e17c20269546c5fff1946c2924aaca 100644 (file)
--- a/plugins/sudoers/getdate.y
+++ b/plugins/sudoers/getdate.y
@@ -26,9 +26,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c
index d8a2868bbb7c33a38bfda8d1639a32c43c262ced..bb3edd73295ace4a9693aeda1d4f3c2f5400e2bd 100644 (file)
--- a/plugins/sudoers/interfaces.c
+++ b/plugins/sudoers/interfaces.c
@@ -28,9 +28,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/iolog_path.c b/plugins/sudoers/iolog_path.c
index 355bb857bdda4caa2028dc43ee67acd4fdd8ad80..1392f30a8d74605fc15453bfefecd0b4f8756452 100644 (file)
--- a/plugins/sudoers/iolog_path.c
+++ b/plugins/sudoers/iolog_path.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index fdc53beca721142afdf394f4463ff06bf23e38f4..aeb4989a53cd5ad0f9ba128f5387a6221909394e 100644 (file)
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -29,9 +29,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c
index 8f65c432312b9c35d6638fe07e342180284e3fc0..6e2e9cc3b72abc943a2328a1366e0c789a02ded1 100644 (file)
--- a/plugins/sudoers/pwutil.c
+++ b/plugins/sudoers/pwutil.c
@@ -32,9 +32,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c
index 511cd3e84dea500c5b421ac81eaba8d6d9b70847..13fae1e6dddeac1accf824cf5fbb6474cc52d75c 100644 (file)
--- a/plugins/sudoers/pwutil_impl.c
+++ b/plugins/sudoers/pwutil_impl.c
@@ -32,9 +32,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/regress/check_symbols/check_symbols.c b/plugins/sudoers/regress/check_symbols/check_symbols.c
index f8df34e51330ee54ec1699443bfc3cbb5d687d6b..792ddfe0bd58684ec4a31f30c3b97d6a1cc56d5d 100644 (file)
--- a/plugins/sudoers/regress/check_symbols/check_symbols.c
+++ b/plugins/sudoers/regress/check_symbols/check_symbols.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
index dcb099d060f71e4a47fb2f52d772ecfdcb3f6b98..c24b3f95fcafdbb4fedb9c9e4e8ca841b3a1745a 100644 (file)
--- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c
+++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/regress/logging/check_wrap.c b/plugins/sudoers/regress/logging/check_wrap.c
index d2399753eb515f76112bb9a27e4041e847951505..3cab4354ae91e1bfeeaf8911d828c3295a290108 100644 (file)
--- a/plugins/sudoers/regress/logging/check_wrap.c
+++ b/plugins/sudoers/regress/logging/check_wrap.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/regress/parser/check_base64.c b/plugins/sudoers/regress/parser/check_base64.c
index 6eb56d2c9cf4320c80efef57ab0149da8490b2e6..d7dd3276b140692f2214eb87610d3e76a53d8c53 100644 (file)
--- a/plugins/sudoers/regress/parser/check_base64.c
+++ b/plugins/sudoers/regress/parser/check_base64.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/regress/parser/check_digest.c b/plugins/sudoers/regress/parser/check_digest.c
index 9b4b53ee1284695aa8e72d8ee6489ef6f7ca9a58..6289fa0658d1ecacc3f0d911141eb07e20919448 100644 (file)
--- a/plugins/sudoers/regress/parser/check_digest.c
+++ b/plugins/sudoers/regress/parser/check_digest.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/regress/parser/check_hexchar.c b/plugins/sudoers/regress/parser/check_hexchar.c
index b5c49579a7158b5f6c8b004b5db93b4fb274c6f3..558f36c8c0202932693e5aaa93cf84b141da546f 100644 (file)
--- a/plugins/sudoers/regress/parser/check_hexchar.c
+++ b/plugins/sudoers/regress/parser/check_hexchar.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index f6cd6df7c2c0ca97ce83630a93ca14f825461562..8ef7f46c95e7f772d6a43959670fd523d4805e97 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -38,9 +38,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index 5ea72bc2c2a3d8a59bbfada5ee8be2164ccd89e5..054f3cd508ebd190d238b11f573b126853a1c906 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -32,9 +32,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/sudoers/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c
index 1ea9accd198f7ffe8aea2ab8faff96c3ee9be35d..e341a16eb80e76b1751a513f6c86cc42a5411150 100644 (file)
--- a/plugins/sudoers/tsgetgrpw.c
+++ b/plugins/sudoers/tsgetgrpw.c
@@ -34,9 +34,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/plugins/system_group/system_group.c b/plugins/system_group/system_group.c
index 4f365c0d763b4ee32552af38f3e8ae06c4a2e9e2..270f663c52a3c8ffe0c719978d171b190da41b01 100644 (file)
--- a/plugins/system_group/system_group.c
+++ b/plugins/system_group/system_group.c
@@ -34,9 +34,6 @@
 # include "compat/stdbool.h"
 #endif /* HAVE_STDBOOL_H */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/conversation.c b/src/conversation.c
index b423a0e2ad358186869e439bd81ed2c1e5f35fb5..15870690f32452400d1a3b8adb216b7d68799828 100644 (file)
--- a/src/conversation.c
+++ b/src/conversation.c
@@ -31,9 +31,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/exec_pty.c b/src/exec_pty.c
index 06b196f09c83fc3fc90e7240a824c984a99d3486..d6e2d53c186bcbebd81b893099d6bcb2e34ff538 100644 (file)
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -31,9 +31,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/net_ifs.c b/src/net_ifs.c
index d9a80d7058fe06c6c026e711e56fbcccd61ccee7..7c3285ef86193cfb94866deb85ba8d267ce9c79d 100644 (file)
--- a/src/net_ifs.c
+++ b/src/net_ifs.c
@@ -47,9 +47,6 @@ struct rtentry;
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/openbsd.c b/src/openbsd.c
index 41fc7c8cfe29784e068a7abdb19bd39e39231323..6722fbd27a1b18b010b1a44e89cf7ed55f0b6975 100644 (file)
--- a/src/openbsd.c
+++ b/src/openbsd.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/preserve_fds.c b/src/preserve_fds.c
index 818535f25b60c256e8126401fe2c0866e8939d07..319010ce2b6ca60034134734a7f075809d54707f 100644 (file)
--- a/src/preserve_fds.c
+++ b/src/preserve_fds.c
@@ -33,9 +33,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/regress/ttyname/check_ttyname.c b/src/regress/ttyname/check_ttyname.c
index 674189e66b354e3ae7ba76150314f45b26b36c05..fd3b6efd832a4e04ecc0deb293dba1874301bf98 100644 (file)
--- a/src/regress/ttyname/check_ttyname.c
+++ b/src/regress/ttyname/check_ttyname.c
@@ -27,9 +27,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/solaris.c b/src/solaris.c
index bd3cfd7e6e69a02ab9b95fa1d41f5ecc91fb5cca..7702eaaf3bcc63cf5c79174f3132488702968a50 100644 (file)
--- a/src/solaris.c
+++ b/src/solaris.c
@@ -28,9 +28,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/sudo.c b/src/sudo.c
index 261ce8fc69fada892875088351f361a850e62be7..955c7d6803cf9cb460020e5e7d0792f284e627ff 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -36,9 +36,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/tgetpass.c b/src/tgetpass.c
index 369159ade03965413e048ef08e0f4818ac02d406..95e6b32a838f86d0ab6cab972f4a172e40380234 100644 (file)
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -37,9 +37,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/ttyname.c b/src/ttyname.c
index bb6fa27fd1610c5b8ae9765b781dde2626d6adeb..a6bbfccbc32f5ace123ea147c33598690b7dbfa9 100644 (file)
--- a/src/ttyname.c
+++ b/src/ttyname.c
@@ -39,9 +39,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H

diff --git a/src/utmp.c b/src/utmp.c
index 053d38de2f6d835d91055a09ce3ca61f8a1ba386..a413f8c0fc451413fa43640b1a260f64739ba1a1 100644 (file)
--- a/src/utmp.c
+++ b/src/utmp.c
@@ -29,9 +29,6 @@
 # endif
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
-# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H