From: Erwin Janssen <erwinjanssen@outlook.com>
Date: Sun, 18 Sep 2016 12:51:15 +0000 (+0200)
Subject: Remove define and usage of `_hdr_string`
X-Git-Tag: untagged-4431b9bde391f1b69fe5^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=343c4c19183aa533885bccf7b5280b95361f4b42;p=graphviz

Remove define and usage of `_hdr_string`

This define is used in `lib/sfio` to determine if it is alright to include
`<string.h>`. Since we are compiling with standard C and string.h is part
of the standard, we can safely assume this check always evaluates to true
and remove it.
---

diff --git a/ast_common.h.in b/ast_common.h.in
index 62bae9d27..3654e3111 100644
--- a/ast_common.h.in
+++ b/ast_common.h.in
@@ -51,10 +51,6 @@
 #  define _sys_stat 1
 #endif
 
-#ifdef HAVE_STRING_H
-#  define _hdr_string 1
-#endif
-
 #ifdef HAVE_STDINT_H
 #  define _hdr_stdint 1
 #endif
diff --git a/lib/sfio/features/sfio b/lib/sfio/features/sfio
index 0f672b1d7..503d67d24 100644
--- a/lib/sfio/features/sfio
+++ b/lib/sfio/features/sfio
@@ -9,7 +9,6 @@
 hdr time
 sys time
 
-hdr string
 hdr math
 lib qfrexp
 lib qldexp
diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index cea038aba..88139add8 100644
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -91,10 +91,7 @@ extern "C" {
 #endif
 
 #include	<stdlib.h>
-
-#if _hdr_string
 #include	<string.h>
-#endif
 
 #if _hdr_stdint
 #include	<stdint.h>
diff --git a/windows/include/FEATURE/sfio b/windows/include/FEATURE/sfio
index b226f4923..d5b535a2d 100644
--- a/windows/include/FEATURE/sfio
+++ b/windows/include/FEATURE/sfio
@@ -4,7 +4,6 @@
 #define _sys_types	1	/* #include <sys/types.h> ok */
 #define _hdr_time	1	/* #include <time.h> ok */
 #define _sys_time	1	/* #include <sys/time.h> ok */
-#define _hdr_string	1	/* #include <string.h> ok */
 #define _hdr_math	1	/* #include <math.h> ok */
 //#define _hdr_unistd	1	/* #include <unistd.h> ok */
 #define _hdr_values	1	/* #include <values.h> ok */