added 3 changesets to branch 'refs/remotes/mmadia-github/separate-build-environment' old head: a0cc9d569bb3f91a6c436507f33b92fab2b58c51 new head: 48231f759b6d3b78c54a23e2d4450259c07d6a31 ---------------------------------------------------------------------------- 8f47b49: Add "struct" after "typedef" for FILE and DIR 300dd7d: Re-add _haiku_build_[getc,putc]_unlocked() 48231f7: Removed target_stdio_[pre,post].h [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- 6 files changed, 8 insertions(+), 20 deletions(-) headers/build/posix/stdio_post.h | 2 +- headers/build/posix/stdio_pre.h | 2 +- headers/build/posix_target/target_dirent.h | 2 +- headers/build/posix_target/target_stdio.h | 6 +++++- headers/build/posix_target/target_stdio_post.h | 8 -------- headers/build/posix_target/target_stdio_pre.h | 8 -------- ############################################################################ Commit: 8f47b493cdef5c0fb7728120ede6bac0cd0381a5 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Tue Aug 14 22:15:01 2012 UTC Add "struct" after "typedef" for FILE and DIR ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_dirent.h b/headers/build/posix_target/target_dirent.h index f627652..b2e43bc 100644 --- a/headers/build/posix_target/target_dirent.h +++ b/headers/build/posix_target/target_dirent.h @@ -19,7 +19,7 @@ typedef struct _HAIKU_BUILD_IDENTIFIER(dirent) { } _HAIKU_BUILD_IDENTIFIER(dirent_t); struct _HAIKU_BUILD_IDENTIFIER(_DIR); -typedef _HAIKU_BUILD_IDENTIFIER(_DIR) _HAIKU_BUILD_IDENTIFIER(DIR); +typedef struct _HAIKU_BUILD_IDENTIFIER(_DIR) _HAIKU_BUILD_IDENTIFIER(DIR); #ifndef _HAIKU_BUILD_MAXNAMLEN # ifdef _HAIKU_BUILD_NAME_MAX diff --git a/headers/build/posix_target/target_stdio.h b/headers/build/posix_target/target_stdio.h index 4a677db..d8b3503 100644 --- a/headers/build/posix_target/target_stdio.h +++ b/headers/build/posix_target/target_stdio.h @@ -108,7 +108,7 @@ typedef _haiku_build_off_t fpos_t; */ //#include <target_stdio_pre.h> struct _HAIKU_BUILD_IDENTIFIER(_FILE); -typedef _HAIKU_BUILD_IDENTIFIER(_FILE) _HAIKU_BUILD_IDENTIFIER(FILE); +typedef struct _HAIKU_BUILD_IDENTIFIER(_FILE) _HAIKU_BUILD_IDENTIFIER(FILE); #define __HAIKU_BUILD_PRINTFLIKE(format, varargs) \ __attribute__ ((__format__ (__printf__, format, varargs))) ############################################################################ Commit: 300dd7da4c764380aaf2c0fefa4e2e0980dd4c46 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Tue Aug 14 22:20:48 2012 UTC Re-add _haiku_build_[getc,putc]_unlocked() ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_stdio.h b/headers/build/posix_target/target_stdio.h index d8b3503..9193088 100644 --- a/headers/build/posix_target/target_stdio.h +++ b/headers/build/posix_target/target_stdio.h @@ -232,6 +232,8 @@ _HAIKU_BUILD_DECLARE_FUNCTION(size_t, fread, _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, _HAIKU_BUILD_IDENTIFIER(FILE) *stream)) _HAIKU_BUILD_DECLARE_FUNCTION(int, putchar_unlocked, (int c)) _HAIKU_BUILD_DECLARE_FUNCTION(int, fputc, (int c, _HAIKU_BUILD_IDENTIFIER(FILE) *stream)) @@ -243,6 +245,8 @@ _HAIKU_BUILD_DECLARE_FUNCTION(int, fputs, _HAIKU_BUILD_DECLARE_FUNCTION(int, getc, (_HAIKU_BUILD_IDENTIFIER(FILE) *stream)) +_HAIKU_BUILD_DECLARE_FUNCTION(int, getc_unlocked, + (_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)) ############################################################################ Commit: 48231f759b6d3b78c54a23e2d4450259c07d6a31 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Tue Aug 14 23:16:42 2012 UTC Removed target_stdio_[pre,post].h ---------------------------------------------------------------------------- diff --git a/headers/build/posix/stdio_post.h b/headers/build/posix/stdio_post.h index bc37c20..d6c440d 100644 --- a/headers/build/posix/stdio_post.h +++ b/headers/build/posix/stdio_post.h @@ -6,7 +6,7 @@ #define _HAIKU_BUILD_STDIO_POST_H_ -#include "posix_target/target_stdio_post.h" +// Empty header. #endif diff --git a/headers/build/posix/stdio_pre.h b/headers/build/posix/stdio_pre.h index ad828ab..629d44a 100644 --- a/headers/build/posix/stdio_pre.h +++ b/headers/build/posix/stdio_pre.h @@ -6,7 +6,7 @@ #define _HAIKU_BUILD_STDIO_PRE_H_ -#include "posix_target/target_stdio_pre.h" +// Empty header. #endif diff --git a/headers/build/posix_target/target_stdio_post.h b/headers/build/posix_target/target_stdio_post.h deleted file mode 100644 index df18f02..0000000 --- a/headers/build/posix_target/target_stdio_post.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2012 Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - */ -#ifndef _STDIO_POST_H_ -#define _STDIO_POST_H_ - -#endif diff --git a/headers/build/posix_target/target_stdio_pre.h b/headers/build/posix_target/target_stdio_pre.h deleted file mode 100644 index 9a57845..0000000 --- a/headers/build/posix_target/target_stdio_pre.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2012 Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - */ -#ifndef _STDIO_PRE_H_ -#define _STDIO_PRE_H_ - -#endif \ No newline at end of file