forked from omniti-labs/omnios-build
-
-
Notifications
You must be signed in to change notification settings - Fork 99
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3804 from citrus-it/pkgrsyncr52
rsync - update from 3.3.0 to 3.4.0 (r151052)
- Loading branch information
Showing
3 changed files
with
16 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac | ||
--- a~/configure.ac 1970-01-01 00:00:00 | ||
+++ a/configure.ac 1970-01-01 00:00:00 | ||
@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable | ||
#include <stdlib.h> | ||
#include <sys/types.h> | ||
#include <sys/socket.h> | ||
-main() | ||
+int main(void) | ||
diff --git a/popt/findme.c b/popt/findme.c | ||
index ac4cbae..65f6ebc 100644 | ||
--- a/popt/findme.c | ||
+++ b/popt/findme.c | ||
@@ -9,6 +9,8 @@ | ||
#include "system.h" | ||
#include "findme.h" | ||
|
||
+#include <alloca.h> | ||
+ | ||
const char * findProgramPath(const char * argv0) | ||
{ | ||
if (socket(AF_INET6, SOCK_STREAM, 0) < 0) | ||
exit(1); | ||
char * path = getenv("PATH"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters