hrev49489 adds 1 changeset to branch 'master'
old head: 3333f968888ae8017be5c01149e619a533b0aba1
new head: 9bec480a7d3a4a38ad141e746841386834d98925
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=9bec480a7d3a+%5E3333f968888a
----------------------------------------------------------------------------
9bec480a7d3a: PackageInstaller: Fix the build.
Previously, <stdlib.h> wasn't included (which is where environ is),
but Axel changed some Be API headers and now it is indirectly included,
which broke the build.
Fixes #12263.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev49489
Commit: 9bec480a7d3a4a38ad141e746841386834d98925
URL: http://cgit.haiku-os.org/haiku/commit/?id=9bec480a7d3a
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jul 31 15:00:54 2015 UTC
Ticket: https://dev.haiku-os.org/ticket/12263
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 4 deletions(-)
src/apps/packageinstaller/PackageItem.cpp | 7 +++----
----------------------------------------------------------------------------
diff --git a/src/apps/packageinstaller/PackageItem.cpp
b/src/apps/packageinstaller/PackageItem.cpp
index e562d63..43fa932 100644
--- a/src/apps/packageinstaller/PackageItem.cpp
+++ b/src/apps/packageinstaller/PackageItem.cpp
@@ -9,6 +9,7 @@
#include "PackageItem.h"
+#include <stdlib.h>
#include <string.h>
#include <Alert.h>
@@ -43,8 +44,6 @@ enum {
P_ATTRIBUTE
};
-extern const char **environ;
-
status_t
inflate_data(uint8 *in, uint32 inSize, uint8 *out, uint32 outSize)
@@ -748,7 +747,7 @@ PackageScript::_RunScript(const char* workingDirectory,
const BString& script)
int old_in = dup(0);
int old_out = dup(1);
int old_err = dup(2);
-
+
int filedes[2];
/* Create new pipe FDs as stdin, stdout, stderr */
@@ -763,7 +762,7 @@ PackageScript::_RunScript(const char* workingDirectory,
const BString& script)
argv[2] = NULL;
// "load" command.
- fThreadId = load_image(2, argv, environ);
+ fThreadId = load_image(2, argv, (const char**)environ);
int i;
for (i = 0; i < 2; i++)
