From b05d6f0af0d5ba3f18462ceb1929bb4ab6e0c03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 5 Nov 2020 18:35:24 +0100 Subject: [PATCH] POSIX: asprintf and vasprintf are BSD/GNU extensions fix #16259 Change-Id: Ia16bb6e1944b87b25d1a940bbdaaf6e236db1abf Reviewed-on: https://review.haiku-os.org/c/haiku/+/3381 Reviewed-by: Adrien Destugues --- headers/compatibility/bsd/stdio.h | 4 ++++ headers/posix/stdio.h | 2 -- src/apps/expander/Jamfile | 2 ++ src/apps/showimage/Jamfile | 2 ++ src/apps/stylededit/Jamfile | 3 +++ src/bin/Jamfile | 5 +++++ src/kits/interface/Jamfile | 3 +++ 7 files changed, 19 insertions(+), 2 deletions(-) diff --git a/headers/compatibility/bsd/stdio.h b/headers/compatibility/bsd/stdio.h index b73d0905fe..d41e740d36 100644 --- a/headers/compatibility/bsd/stdio.h +++ b/headers/compatibility/bsd/stdio.h @@ -19,6 +19,10 @@ extern "C" { char *fgetln(FILE *stream, size_t *_length); +int asprintf(char **ret, char const *format, ...) __PRINTFLIKE(2,3); +int vasprintf(char **ret, char const *format, va_list ap); + + #ifdef __cplusplus } #endif diff --git a/headers/posix/stdio.h b/headers/posix/stdio.h index d6448d712a..b40328ea08 100644 --- a/headers/posix/stdio.h +++ b/headers/posix/stdio.h @@ -176,12 +176,10 @@ extern int dprintf(int fd, char const *format, ...) __PRINTFLIKE(2,3); extern int fprintf(FILE *stream, char const *format, ...) __PRINTFLIKE(2,3); extern int sprintf(char *string, char const *format, ...) __PRINTFLIKE(2,3); extern int snprintf(char *string, size_t size, char const *format, ...) __PRINTFLIKE(3,4); -extern int asprintf(char **ret, char const *format, ...) __PRINTFLIKE(2,3); extern int vprintf(char const *format, va_list ap); extern int vfprintf(FILE *stream, char const *format, va_list ap); extern int vsprintf(char *string, char const *format, va_list ap); extern int vsnprintf(char *string, size_t size, char const *format, va_list ap); -extern int vasprintf(char **ret, char const *format, va_list ap); extern int scanf(char const *format, ...); extern int fscanf(FILE *stream, char const *format, ...); diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile index 6c6df750c9..9549d391f7 100644 --- a/src/apps/expander/Jamfile +++ b/src/apps/expander/Jamfile @@ -1,6 +1,8 @@ SubDir HAIKU_TOP src apps expander ; UsePrivateHeaders shared ; +ObjectSysHdrs DirectoryFilePanel.cpp : + [ FDirName $(HAIKU_TOP) headers compatibility bsd ] ; Application Expander : ExpanderApp.cpp diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile index e49f448df8..37962a6727 100644 --- a/src/apps/showimage/Jamfile +++ b/src/apps/showimage/Jamfile @@ -6,6 +6,8 @@ UsePrivateHeaders tracker shared ; UsePublicHeaders [ FDirName be_apps Tracker ] ; SubDirHdrs $(HAIKU_TOP) src kits tracker ; UseHeaders [ FDirName $(HAIKU_TOP) src kits tracker ] : false ; +ObjectSysHdrs ShowImageWindow.cpp : + [ FDirName $(HAIKU_TOP) headers compatibility bsd ] ; Application ShowImage : Filter.cpp diff --git a/src/apps/stylededit/Jamfile b/src/apps/stylededit/Jamfile index 23bfb2c671..7954a0c16f 100644 --- a/src/apps/stylededit/Jamfile +++ b/src/apps/stylededit/Jamfile @@ -6,6 +6,9 @@ UsePrivateHeaders tracker shared ; UsePublicHeaders [ FDirName be_apps Tracker ] ; SubDirHdrs $(HAIKU_TOP) src kits tracker ; UseHeaders [ FDirName $(HAIKU_TOP) src kits tracker ] : false ; +ObjectSysHdrs StyledEditWindow.cpp : + [ FDirName $(HAIKU_TOP) headers compatibility bsd ] ; + local styled_edit_rsrc = [ FGristFiles StyledEdit.rsrc ] diff --git a/src/bin/Jamfile b/src/bin/Jamfile index 64cdd49de7..3bf2496840 100644 --- a/src/bin/Jamfile +++ b/src/bin/Jamfile @@ -23,6 +23,9 @@ AddResources notify : notify.rdef ; AddResources setmime : setmime.rdef ; AddResources urlwrapper : urlwrapper.rdef ; +ObjectSysHdrs listimage.c : + [ FDirName $(HAIKU_TOP) headers compatibility bsd ] ; + # standard commands that don't need any additional library StdBinCommands badblocks.cpp @@ -67,6 +70,8 @@ StdBinCommands Includes [ FGristFiles top.cpp watch.c ] : [ BuildFeatureAttribute ncurses : headers ] ; +ObjectSysHdrs watch.c : [ FDirName $(HAIKU_TOP) headers compatibility bsd ] ; + StdBinCommands watch.c : [ BuildFeatureAttribute ncurses : library ] : $(haiku-utils_rsrc) ; diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile index 86b93f25f7..18b3f68eb5 100644 --- a/src/kits/interface/Jamfile +++ b/src/kits/interface/Jamfile @@ -33,6 +33,9 @@ for architectureObject in [ MultiArchSubDirSetup ] { SEARCH_SOURCE += [ FDirName $(SUBDIR) textview_support ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) layouter ] ; + ObjectSysHdrs DecimalSpinner.cpp : + [ FDirName $(HAIKU_TOP) headers compatibility bsd ] ; + MergeObject interface_kit.o : AboutWindow.cpp AbstractLayout.cpp