[haiku-commits] BRANCH mmadia-github.separate-build-environment - in headers/build: posix_target os_target/kernel
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 14 Aug 2012 01:49:24 +0200 (CEST)
added 6 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: 16f252c6d43692c1201567a2267c1eb027bd431f
new head: a0cc9d569bb3f91a6c436507f33b92fab2b58c51
----------------------------------------------------------------------------
bba6967: Changes from commit review.
* Wrapped FILE.
* Removed HAIKU_BUILD_DECLARE_VARIABLE(char, _single_threaded)
* Removed _haiku_build_{get,put}c_unlocked()
* Added a TODO about _haiku_build_[get,put]c()
76f2861: White space cleanup. No functional change.
8c5f6ed: Fixed uses of _HAIKU_BUILD_DECLARE_FUNCTION
13c246c: Wrap DIR, similarly to stdio.h's FILE.
eb16ac2: Update references to DIR with _HAIKU_BUILD_IDENTIFIER() macro.
a0cc9d5: Whitespace cleanup. No functional change.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 201 insertions(+), 125 deletions(-)
headers/build/os_target/kernel/target_fs_attr.h | 10 +-
headers/build/posix_target/target_dirent.h | 48 ++--
headers/build/posix_target/target_stdio.h | 268 ++++++++++++-------
############################################################################
Commit: bba69677e2aa083412d50e8ca8e305abda1a84fe
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Mon Aug 13 23:16:27 2012 UTC
Changes from commit review.
* Wrapped FILE.
* Removed HAIKU_BUILD_DECLARE_VARIABLE(char, _single_threaded)
* Removed _haiku_build_{get,put}c_unlocked()
* Added a TODO about _haiku_build_[get,put]c()
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_stdio.h
b/headers/build/posix_target/target_stdio.h
index e8594b8..df57653 100644
--- a/headers/build/posix_target/target_stdio.h
+++ b/headers/build/posix_target/target_stdio.h
@@ -107,7 +107,8 @@ typedef _haiku_build_off_t fpos_t;
Start with an empty file and only add something, if actually used.
*/
//#include <target_stdio_pre.h>
-typedef struct _HAIKU_BUILD_IDENTIFIER(_IO_FILE) FILE;
+struct _HAIKU_BUILD_IDENTIFIER(_FILE);
+typedef _HAIKU_BUILD_IDENTIFIER(_FILE) _HAIKU_BUILD_IDENTIFIER(FILE);
#define __HAIKU_BUILD_PRINTFLIKE(format, varargs) __attribute__ ((__format__
(__printf__, format, varargs)))
#define __HAIKU_BUILD_SCANFLIKE(format, varargs) __attribute__((__format__
(__scanf__, format, varargs)))
@@ -117,9 +118,9 @@ typedef struct _HAIKU_BUILD_IDENTIFIER(_IO_FILE) FILE;
#endif /* _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER */
// end of stdio_pre.h
-_HAIKU_BUILD_DECLARE_VARIABLE(FILE*, stdin)
-_HAIKU_BUILD_DECLARE_VARIABLE(FILE*, stdout)
-_HAIKU_BUILD_DECLARE_VARIABLE(FILE*, stderr)
+_HAIKU_BUILD_DECLARE_VARIABLE(_HAIKU_BUILD_IDENTIFIER(FILE)*, stdin)
+_HAIKU_BUILD_DECLARE_VARIABLE(_HAIKU_BUILD_IDENTIFIER(FILE)*, stdout)
+_HAIKU_BUILD_DECLARE_VARIABLE(_HAIKU_BUILD_IDENTIFIER(FILE)*, stderr)
#ifdef __cplusplus
@@ -127,104 +128,102 @@ extern "C" {
#endif
/* file operations */
-_HAIKU_BUILD_DECLARE_FUNCTION(FILE*, fopen, (const char *name, const char
*mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(FILE*, freopen, (const char *name, const char
*mode, FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(FILE*, fdopen, (int fd, const char *mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fclose, (FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fopen, (const
char *name, const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, freopen, (const
char *name, const char *mode, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fdopen, (int fd,
const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fclose, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno_unlocked, (FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror_unlocked, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr_unlocked, (FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, feof, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, feof_unlocked, (FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, feof, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, feof_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, flockfile, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, funlockfile, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ftrylockfile, (FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, flockfile, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, funlockfile,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ftrylockfile,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, remove, (const char *name))
_HAIKU_BUILD_DECLARE_FUNCTION(int, rename, (const char *from, const char *to))
_HAIKU_BUILD_DECLARE_FUNCTION(int, renameat, (int fromFD, const char *from,
int toFD, const char *to))
/* pipes */
-_HAIKU_BUILD_DECLARE_FUNCTION(FILE*, popen, (const char *command, const char
*mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, pclose, (FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, popen, (const
char *command, const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, pclose, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
_HAIKU_BUILD_DECLARE_FUNCTION(void, perror, (const char *errorPrefix))
/* memory streams */
-_HAIKU_BUILD_DECLARE_FUNCTION(FILE*, fmemopen, (void *buf, size_t size, const
char *mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(FILE*, open_memstream, (char **buf, size_t
*size))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fmemopen, (void
*buf, size_t size, const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, open_memstream,
(char **buf, size_t *size))
/* file I/O */
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush_unlocked, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fpurge, (FILE *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetpos, (FILE *stream, fpos_t *position))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fsetpos, (FILE *stream, const fpos_t
*position))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fseek, (FILE *stream, long offset, int
seekType))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fseeko, (FILE *stream, off_t offset, int
seekType))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, _fseek, (FILE *stream, fpos_t offset, int
seekType))
-_HAIKU_BUILD_DECLARE_FUNCTION(long, ftell, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_off_t, ftello, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_fpos_t, _ftell, (FILE *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(void, rewind, (FILE *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(void, setbuf, (FILE *file, char *buff))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, setvbuf, (FILE *file, char *buff, int mode,
size_t size))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, setbuffer, (FILE *stream, char *buf, size_t
size))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, setlinebuf, (FILE *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fwrite, (const void *buffer, size_t
size, size_t numItems, FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fread, (void *buffer, size_t size,
size_t numItems, FILE *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, putc, (int c, FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fpurge, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetpos, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, fpos_t *position))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fsetpos, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, const fpos_t *position))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fseek, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, long offset, int seekType))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fseeko, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, off_t offset, int seekType))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, _fseek, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, fpos_t offset, int seekType))
+_HAIKU_BUILD_DECLARE_FUNCTION(long, ftell, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_off_t, ftello,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_fpos_t, _ftell,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(void, rewind, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(void, setbuf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*file, char *buff))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, setvbuf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*file, char *buff, int mode, size_t size))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, setbuffer, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char *buf, size_t size))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, setlinebuf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fwrite, (const void *buffer, size_t
size, size_t numItems, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fread, (void *buffer, size_t size,
size_t numItems, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, putc, (int c, _HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, putchar(int c))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, putc_unlocked, (int c, FILE *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, putchar_unlocked, (int c))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc, (int c, FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc_unlocked, (int c, FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc, (int c,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc_unlocked, (int c,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, puts, (const char *string))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fputs, (const char *string, FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fputs, (const char *string,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, getc, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, getc_unlocked, (FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ungetc, (int c, FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, getc, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ungetc, (int c,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, getchar, (void))
_HAIKU_BUILD_DECLARE_FUNCTION(int, getchar_unlocked, (void))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetc, (FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetc, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
_HAIKU_BUILD_DECLARE_FUNCTION(char*, gets, (char *buffer))
-_HAIKU_BUILD_DECLARE_FUNCTION(char*, fgets, (char *string, int stringLength,
FILE *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(char*, fgets, (char *string, int stringLength,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, getdelim, (char **_line, size_t
*_length, int delimiter,
- FILE *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, getline, (char **_line, size_t
*_length, FILE *stream))
+ _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, getline, (char **_line, size_t
*_length, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
/* formatted I/O */
/* TODO: #8730 */
_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, printf, (char const *format, ...),
__PRINTFLIKE(1,2))
-_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, fprintf, (FILE *stream, char const
*format, ...), __PRINTFLIKE(2,3))
+_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, fprintf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, ...), __PRINTFLIKE(2,3))
_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, sprintf, (char *string, char const
*format, ...), __PRINTFLIKE(2,3))
_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, snprintf, (char *string, size_t size,
char const *format, ...), __PRINTFLIKE(3,4))
_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, asprintf, (char **ret, char const
*format, ...), __PRINTFLIKE(2,3))
_HAIKU_BUILD_DECLARE_FUNCTION(int, vprintf, (char const *format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vfprintf, (FILE *stream, char const
*format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vfprintf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, va_list ap))
_HAIKU_BUILD_DECLARE_FUNCTION(int, vsprintf, (char *string, char const
*format, va_list ap))
_HAIKU_BUILD_DECLARE_FUNCTION(int, vsnprintf, (char *string, size_t size, char
const *format, va_list ap))
_HAIKU_BUILD_DECLARE_FUNCTION(int, vasprintf, (char **ret, char const *format,
va_list ap))
_HAIKU_BUILD_DECLARE_FUNCTION(int, scanf, (char const *format, ...))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fscanf, (FILE *stream, char const *format,
...))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fscanf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, ...))
_HAIKU_BUILD_DECLARE_FUNCTION(int, sscanf, (char const *str, char const
*format, ...))
_HAIKU_BUILD_DECLARE_FUNCTION(int, vscanf, (char const *format, va_list ap))
_HAIKU_BUILD_DECLARE_FUNCTION(int, vsscanf, (char const *str, char const
*format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vfscanf, (FILE *stream, char const *format,
va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vfscanf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, va_list ap))
/* misc */
_HAIKU_BUILD_DECLARE_FUNCTION(char*, ctermid, (char *controllingTerminal))
@@ -232,25 +231,14 @@ _HAIKU_BUILD_DECLARE_FUNCTION(char*, cuserid, (char *s))
/* temporary files */
_HAIKU_BUILD_DECLARE_FUNCTION(char*, tempnam, (char const *path, char const
*prefix))
-_HAIKU_BUILD_DECLARE_FUNCTION(FILE*, tmpfile,(void))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, tmpfile,(void))
_HAIKU_BUILD_DECLARE_FUNCTION(char*, tmpnam,(char *nameBuffer))
_HAIKU_BUILD_DECLARE_FUNCTION(char*, tmpnam_r, (char *nameBuffer))
// #include <target_stdio_post.h>
-// NOTE: #8730 -- uncertain on these changes pertaining to including
stdio_post.h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_HAIKU_BUILD_DECLARE_VARIABLE(char, _single_threaded)
- /* this boolean value is true (1) if there is only the main thread
- * running - as soon as you spawn the first thread, it's set to
- * false (0) */
-
-#ifdef __cplusplus
-}
-#endif
-
+/* TODO: #8730 -- These should be defined as functions instead (check the
+ POSIX specs for their signature).
+*/
#define _haiku_build_getc(stream) \
(_single_threaded ? _haiku_build_getc_unlocked(stream) :
_haiku_build_getc(stream))
#define _haiku_build_putc(c, stream) \
############################################################################
Commit: 76f28614d95d3444d9e6abf88ffa261e49b8ae07
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Mon Aug 13 23:25:53 2012 UTC
White space cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_stdio.h
b/headers/build/posix_target/target_stdio.h
index df57653..4a677db 100644
--- a/headers/build/posix_target/target_stdio.h
+++ b/headers/build/posix_target/target_stdio.h
@@ -110,11 +110,15 @@ typedef _haiku_build_off_t fpos_t;
struct _HAIKU_BUILD_IDENTIFIER(_FILE);
typedef _HAIKU_BUILD_IDENTIFIER(_FILE) _HAIKU_BUILD_IDENTIFIER(FILE);
-#define __HAIKU_BUILD_PRINTFLIKE(format, varargs) __attribute__ ((__format__
(__printf__, format, varargs)))
-#define __HAIKU_BUILD_SCANFLIKE(format, varargs) __attribute__((__format__
(__scanf__, format, varargs)))
+#define __HAIKU_BUILD_PRINTFLIKE(format, varargs) \
+ __attribute__ ((__format__ (__printf__, format, varargs)))
+#define __HAIKU_BUILD_SCANFLIKE(format, varargs) \
+ __attribute__((__format__ (__scanf__, format, varargs)))
#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
-# define __PRINTFLIKE(format, varargs)
__HAIKU_BUILD_PRINTFLIKE(format, varargs)
-# define __SCANFLIKE(format, varargs)
__HAIKU_BUILD_SCANFLIKE(format, varargs)
+# define __PRINTFLIKE(format, varargs) \
+ __HAIKU_BUILD_PRINTFLIKE(format, varargs)
+# define __SCANFLIKE(format, varargs) \
+ __HAIKU_BUILD_SCANFLIKE(format, varargs)
#endif /* _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER */
// end of stdio_pre.h
@@ -128,109 +132,177 @@ extern "C" {
#endif
/* file operations */
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fopen, (const
char *name, const char *mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, freopen, (const
char *name, const char *mode, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fdopen, (int fd,
const char *mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fclose, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, feof, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, feof_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(void, flockfile, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, funlockfile,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ftrylockfile,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fopen,
+ (const char *name, const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, freopen,
+ (const char *name, const char *mode, _HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fdopen,
+ (int fd, const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fclose,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fileno_unlocked,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ferror_unlocked,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, clearerr_unlocked,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, feof,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, feof_unlocked,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(void, flockfile,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, funlockfile,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ftrylockfile,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, remove, (const char *name))
_HAIKU_BUILD_DECLARE_FUNCTION(int, rename, (const char *from, const char *to))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, renameat, (int fromFD, const char *from,
int toFD, const char *to))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, renameat,
+ (int fromFD, const char *from, int toFD, const char *to))
/* pipes */
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, popen, (const
char *command, const char *mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, pclose, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, popen,
+ (const char *command, const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, pclose,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(void, perror, (const char *errorPrefix))
/* memory streams */
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fmemopen, (void
*buf, size_t size, const char *mode))
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, open_memstream,
(char **buf, size_t *size))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, fmemopen,
+ (void *buf, size_t size, const char *mode))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, open_memstream,
+ (char **buf, size_t *size))
/* file I/O */
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush_unlocked,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fpurge, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetpos, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, fpos_t *position))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fsetpos, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, const fpos_t *position))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fseek, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, long offset, int seekType))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fseeko, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, off_t offset, int seekType))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, _fseek, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, fpos_t offset, int seekType))
-_HAIKU_BUILD_DECLARE_FUNCTION(long, ftell, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_off_t, ftello,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_fpos_t, _ftell,
(_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(void, rewind, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(void, setbuf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*file, char *buff))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, setvbuf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*file, char *buff, int mode, size_t size))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, setbuffer, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char *buf, size_t size))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, setlinebuf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fwrite, (const void *buffer, size_t
size, size_t numItems, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fread, (void *buffer, size_t size,
size_t numItems, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, putc, (int c, _HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fflush_unlocked,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fpurge,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetpos,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, fpos_t *position))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fsetpos,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, const fpos_t *position))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fseek,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, long offset, int seekType))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fseeko,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, off_t offset, int seekType))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, _fseek,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, fpos_t offset, int seekType))
+_HAIKU_BUILD_DECLARE_FUNCTION(long, ftell,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_off_t, ftello,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_fpos_t, _ftell,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(void, rewind,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(void, setbuf,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *file, char *buff))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, setvbuf,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *file, char *buff, int mode, size_t
size))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, setbuffer,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, char *buf, size_t size))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, setlinebuf,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fwrite,
+ (const void *buffer, size_t size, size_t numItems,
+ _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(size_t, fread,
+ (void *buffer, size_t size, size_t numItems,
+ _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, putc,
+ (int c, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, putchar(int c))
_HAIKU_BUILD_DECLARE_FUNCTION(int, putchar_unlocked, (int c))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc, (int c,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc_unlocked, (int c,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc,
+ (int c, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fputc_unlocked,
+ (int c, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, puts, (const char *string))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fputs, (const char *string,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fputs,
+ (const char *string, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, getc, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, ungetc, (int c,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, getc,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, ungetc,
+ (int c, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(int, getchar, (void))
_HAIKU_BUILD_DECLARE_FUNCTION(int, getchar_unlocked, (void))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetc, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fgetc,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
_HAIKU_BUILD_DECLARE_FUNCTION(char*, gets, (char *buffer))
-_HAIKU_BUILD_DECLARE_FUNCTION(char*, fgets, (char *string, int stringLength,
_HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(char*, fgets,
+ (char *string, int stringLength, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, getdelim, (char **_line, size_t
*_length, int delimiter,
- _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
-_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, getline, (char **_line, size_t
*_length, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, getdelim,
+ (char **_line, size_t *_length, int delimiter,
+ _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
+_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, getline,
+ (char **_line, size_t *_length, _HAIKU_BUILD_IDENTIFIER(FILE) *stream))
/* formatted I/O */
/* TODO: #8730 */
-_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, printf, (char const *format, ...),
__PRINTFLIKE(1,2))
-_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, fprintf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, ...), __PRINTFLIKE(2,3))
-_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, sprintf, (char *string, char const
*format, ...), __PRINTFLIKE(2,3))
-_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, snprintf, (char *string, size_t size,
char const *format, ...), __PRINTFLIKE(3,4))
-_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, asprintf, (char **ret, char const
*format, ...), __PRINTFLIKE(2,3))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vprintf, (char const *format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vfprintf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vsprintf, (char *string, char const
*format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vsnprintf, (char *string, size_t size, char
const *format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vasprintf, (char **ret, char const *format,
va_list ap))
-
-_HAIKU_BUILD_DECLARE_FUNCTION(int, scanf, (char const *format, ...))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fscanf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, ...))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, sscanf, (char const *str, char const
*format, ...))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vscanf, (char const *format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vsscanf, (char const *str, char const
*format, va_list ap))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, vfscanf, (_HAIKU_BUILD_IDENTIFIER(FILE)
*stream, char const *format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, printf,
+ (char const *format, ...), __PRINTFLIKE(1,2))
+_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, fprintf,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, char const *format, ...),
+ __PRINTFLIKE(2,3))
+_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, sprintf,
+ (char *string, char const *format, ...), __PRINTFLIKE(2,3))
+_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, snprintf,
+ (char *string, size_t size, char const *format, ...), __PRINTFLIKE(3,4))
+_HAIKU_BUILD_DECLARE_FUNCTION_ETC(int, asprintf,
+ (char **ret, char const *format, ...), __PRINTFLIKE(2,3))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vprintf,
+ (char const *format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vfprintf,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, char const *format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vsprintf,
+ (char *string, char const *format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vsnprintf,
+ (char *string, size_t size, char const *format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vasprintf,
+ (char **ret, char const *format, va_list ap))
+
+_HAIKU_BUILD_DECLARE_FUNCTION(int, scanf,
+ (char const *format, ...))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fscanf,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, char const *format, ...))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, sscanf,
+ (char const *str, char const *format, ...))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vscanf,
+ (char const *format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vsscanf,
+ (char const *str, char const *format, va_list ap))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, vfscanf,
+ (_HAIKU_BUILD_IDENTIFIER(FILE) *stream, char const *format, va_list ap))
/* misc */
_HAIKU_BUILD_DECLARE_FUNCTION(char*, ctermid, (char *controllingTerminal))
_HAIKU_BUILD_DECLARE_FUNCTION(char*, cuserid, (char *s))
/* temporary files */
-_HAIKU_BUILD_DECLARE_FUNCTION(char*, tempnam, (char const *path, char const
*prefix))
+_HAIKU_BUILD_DECLARE_FUNCTION(char*, tempnam,
+ (char const *path, char const *prefix))
_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(FILE)*, tmpfile,(void))
_HAIKU_BUILD_DECLARE_FUNCTION(char*, tmpnam,(char *nameBuffer))
_HAIKU_BUILD_DECLARE_FUNCTION(char*, tmpnam_r, (char *nameBuffer))
@@ -240,9 +312,11 @@ _HAIKU_BUILD_DECLARE_FUNCTION(char*, tmpnam_r, (char
*nameBuffer))
POSIX specs for their signature).
*/
#define _haiku_build_getc(stream) \
- (_single_threaded ? _haiku_build_getc_unlocked(stream) :
_haiku_build_getc(stream))
+ (_single_threaded ? _haiku_build_getc_unlocked(stream) : \
+ _haiku_build_getc(stream))
#define _haiku_build_putc(c, stream) \
- (_single_threaded ? _haiku_build_putc_unlocked(c, stream) :
_haiku_build_putc(c, stream))
+ (_single_threaded ? _haiku_build_putc_unlocked(c, stream) : \
+ _haiku_build_putc(c, stream))
// end of stdio_post.h
############################################################################
Commit: 8c5f6ed064999b2856a15446984e14460350ee09
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Mon Aug 13 23:26:32 2012 UTC
Fixed uses of _HAIKU_BUILD_DECLARE_FUNCTION
----------------------------------------------------------------------------
diff --git a/headers/build/os_target/kernel/target_fs_attr.h
b/headers/build/os_target/kernel/target_fs_attr.h
index 426f46f..6e61447 100644
--- a/headers/build/os_target/kernel/target_fs_attr.h
+++ b/headers/build/os_target/kernel/target_fs_attr.h
@@ -26,15 +26,15 @@ _HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, fs_read_attr, (int
fd,
_HAIKU_BUILD_DECLARE_FUNCTION(ssize_t, fs_write_attr, (int fd,
const char *attribute, _haiku_build_uint32 type, haiku_build_off_t pos,
const void *buffer, size_t readBytes))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_remove_attr(int fd, const char
*attribute))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_stat_attr(int fd, const char *attribute,
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_remove_attr, (int fd, const char
*attribute))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_stat_attr, (int fd, const char
*attribute,
struct attr_info *attrInfo))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_open_attr(const char *path,
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_open_attr, (const char *path,
const char *attribute, _haiku_build_uint32 type, int openMode))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_fopen_attr(int fd,
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_fopen_attr, (int fd,
const char *attribute, _haiku_build_uint32 type, int openMode))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_close_attr(int fd))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, fs_close_attr, (int fd))
_HAIKU_BUILD_DECLARE_FUNCTION(DIR*, fs_open_attr_dir, (const char *path))
_HAIKU_BUILD_DECLARE_FUNCTION(DIR*, fs_lopen_attr_dir, (const char *path))
############################################################################
Commit: 13c246cbd23338e9e7e48b3727fcd3bacecbdb75
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Mon Aug 13 23:37:01 2012 UTC
Wrap DIR, similarly to stdio.h's FILE.
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_dirent.h
b/headers/build/posix_target/target_dirent.h
index a1833d8..6d33fbc 100644
--- a/headers/build/posix_target/target_dirent.h
+++ b/headers/build/posix_target/target_dirent.h
@@ -18,7 +18,8 @@ typedef struct _HAIKU_BUILD_IDENTIFIER(dirent) {
char d_name[1]; /* name of the entry (null byte
terminated) */
} _HAIKU_BUILD_IDENTIFIER(dirent_t);
-typedef struct _HAIKU_BUILD_IDENTIFIER(__DIR) DIR;
+struct _HAIKU_BUILD_IDENTIFIER(_DIR);
+typedef _HAIKU_BUILD_IDENTIFIER(_DIR) _HAIKU_BUILD_IDENTIFIER(DIR);
#ifndef _HAIKU_BUILD_MAXNAMLEN
# ifdef _HAIKU_BUILD_NAME_MAX
############################################################################
Commit: eb16ac2d427f44d04b2547c827b8747eb76d5ed8
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Mon Aug 13 23:39:45 2012 UTC
Update references to DIR with _HAIKU_BUILD_IDENTIFIER() macro.
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_dirent.h
b/headers/build/posix_target/target_dirent.h
index 6d33fbc..8f596bd 100644
--- a/headers/build/posix_target/target_dirent.h
+++ b/headers/build/posix_target/target_dirent.h
@@ -43,16 +43,16 @@ typedef _HAIKU_BUILD_IDENTIFIER(_DIR)
_HAIKU_BUILD_IDENTIFIER(DIR);
extern "C" {
#endif
-_HAIKU_BUILD_DECLARE_FUNCTION(DIR*, fdopendir, (int fd))
-_HAIKU_BUILD_DECLARE_FUNCTION(DIR*, opendir, (const char* dirName))
-_HAIKU_BUILD_DECLARE_FUNCTION(struct _HAIKU_BUILD_IDENTIFIER(dirent_t)*,
readdir, (DIR* dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, readdir_r, (DIR* dir, struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)* entry,
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(DIR)*, fdopendir, (int
fd))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(DIR)*, opendir, (const
char* dirName))
+_HAIKU_BUILD_DECLARE_FUNCTION(struct _HAIKU_BUILD_IDENTIFIER(dirent_t)*,
readdir, (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, readdir_r, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir, struct _HAIKU_BUILD_IDENTIFIER(dirent_t)* entry,
struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** _result))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, closedir, (DIR* dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, rewinddir, (DIR* dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, seekdir, (DIR* dir, long int position))
-_HAIKU_BUILD_DECLARE_FUNCTION(long int, telldir, (DIR* dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, dirfd, (DIR* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, closedir, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, rewinddir, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, seekdir, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir, long int position))
+_HAIKU_BUILD_DECLARE_FUNCTION(long int, telldir,
(_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, dirfd, (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
_HAIKU_BUILD_DECLARE_FUNCTION(int, alphasort, (const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry1,
const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry2))
############################################################################
Commit: a0cc9d569bb3f91a6c436507f33b92fab2b58c51
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Mon Aug 13 23:42:39 2012 UTC
Whitespace cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_dirent.h
b/headers/build/posix_target/target_dirent.h
index 8f596bd..f627652 100644
--- a/headers/build/posix_target/target_dirent.h
+++ b/headers/build/posix_target/target_dirent.h
@@ -43,23 +43,36 @@ typedef _HAIKU_BUILD_IDENTIFIER(_DIR)
_HAIKU_BUILD_IDENTIFIER(DIR);
extern "C" {
#endif
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(DIR)*, fdopendir, (int
fd))
-_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(DIR)*, opendir, (const
char* dirName))
-_HAIKU_BUILD_DECLARE_FUNCTION(struct _HAIKU_BUILD_IDENTIFIER(dirent_t)*,
readdir, (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, readdir_r, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir, struct _HAIKU_BUILD_IDENTIFIER(dirent_t)* entry,
- struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** _result))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, closedir, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, rewinddir, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(void, seekdir, (_HAIKU_BUILD_IDENTIFIER(DIR)*
dir, long int position))
-_HAIKU_BUILD_DECLARE_FUNCTION(long int, telldir,
(_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, dirfd, (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(DIR)*, fdopendir,
+ (int fd))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(DIR)*, opendir,
+ (const char* dirName))
+_HAIKU_BUILD_DECLARE_FUNCTION(struct _HAIKU_BUILD_IDENTIFIER(dirent_t)*,
+ readdir, (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, readdir_r,
+ (_HAIKU_BUILD_IDENTIFIER(DIR)* dir,
+ struct _HAIKU_BUILD_IDENTIFIER(dirent_t)* entry,
+ struct _HAIKU_BUILD_IDENTIFIER(dirent_t)** _result))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, closedir,
+ (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, rewinddir,
+ (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(void, seekdir,
+ (_HAIKU_BUILD_IDENTIFIER(DIR)* dir, long int position))
+_HAIKU_BUILD_DECLARE_FUNCTION(long int, telldir,
+ (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, dirfd,
+ (_HAIKU_BUILD_IDENTIFIER(DIR)* dir))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, alphasort, (const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry1,
- const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry2))
-_HAIKU_BUILD_DECLARE_FUNCTION(int, scandir, (const char* dir, struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)*** _entryArray,
- int (*selectFunc)(const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)*),
- int (*compareFunc)(const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry1,
- const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry2)))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, alphasort,
+ (const struct _HAIKU_BUILD_IDENTIFIER(dirent_t)** entry1,
+ const struct _HAIKU_BUILD_IDENTIFIER(dirent_t)** entry2))
+_HAIKU_BUILD_DECLARE_FUNCTION(int, scandir,
+ (const char* dir, struct _HAIKU_BUILD_IDENTIFIER(dirent_t)***
_entryArray,
+ int (*selectFunc)(const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)*),
+ int (*compareFunc)
+ (const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry1,
+ const struct
_HAIKU_BUILD_IDENTIFIER(dirent_t)** entry2)))
#ifdef __cplusplus
}
Other related posts:
