[PATCH] sim: common: clean up asprintf includes a bit

[PATCH] sim: common: clean up asprintf includes a bit

[Mike Frysinger]

Delete stale prototypes that libiberty.h already provides, and add
missing libiberty.h includes to files that use those functions.
---
 sim/common/sim-basics.h | 5 -----
 sim/common/sim-core.c   | 1 +
 sim/common/sim-watch.c  | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h
index 8634f42d8ac9..52c9b2fa40c3 100644
--- a/sim/common/sim-basics.h
+++ b/sim/common/sim-basics.h
@@ -37,11 +37,6 @@
 #include <stdio.h>
 #include <setjmp.h>
 
-#ifdef __CYGWIN32__
-extern int vasprintf (char **result, const char *format, va_list args);
-extern int asprintf (char **result, const char *format, ...);
-#endif
-
 
 #ifndef NULL
 #define NULL 0
diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index 538230635bc9..ade345ef16fb 100644
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -25,6 +25,7 @@
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "libiberty.h"
 
 #if (WITH_HW)
 #include "sim-hw.h"
diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index 95266501f128..9c929a15731b 100644
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "config.h"
 #include "sim-main.h"
 #include "sim-options.h"
+#include "libiberty.h"
 
 #include "sim-assert.h"
 
-- 
2.28.0

Re: [PATCH] sim: common: clean up asprintf includes a bit

[Andrew Burgess]

* Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org> [2021-01-09 03:06:02 -0500]:

> Delete stale prototypes that libiberty.h already provides, and add
> missing libiberty.h includes to files that use those functions.
> ---
>  sim/common/sim-basics.h | 5 -----
>  sim/common/sim-core.c   | 1 +
>  sim/common/sim-watch.c  | 1 +
>  3 files changed, 2 insertions(+), 5 deletions(-)

LGTM, but will need a ChangeLog entry.

Thanks,
Andrew


> 
> diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h
> index 8634f42d8ac9..52c9b2fa40c3 100644
> --- a/sim/common/sim-basics.h
> +++ b/sim/common/sim-basics.h
> @@ -37,11 +37,6 @@
>  #include <stdio.h>
>  #include <setjmp.h>
>  
> -#ifdef __CYGWIN32__
> -extern int vasprintf (char **result, const char *format, va_list args);
> -extern int asprintf (char **result, const char *format, ...);
> -#endif
> -
>  
>  #ifndef NULL
>  #define NULL 0
> diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
> index 538230635bc9..ade345ef16fb 100644
> --- a/sim/common/sim-core.c
> +++ b/sim/common/sim-core.c
> @@ -25,6 +25,7 @@
>  
>  #include "sim-main.h"
>  #include "sim-assert.h"
> +#include "libiberty.h"
>  
>  #if (WITH_HW)
>  #include "sim-hw.h"
> diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
> index 95266501f128..9c929a15731b 100644
> --- a/sim/common/sim-watch.c
> +++ b/sim/common/sim-watch.c
> @@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
>  #include "config.h"
>  #include "sim-main.h"
>  #include "sim-options.h"
> +#include "libiberty.h"
>  
>  #include "sim-assert.h"
>  
> -- 
> 2.28.0
>