You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2015/01/30 21:39:49 UTC
[1/2] qpid-proton git commit: AIX has getopt in stdlib
Repository: qpid-proton
Updated Branches:
refs/heads/master 7d5bf0a69 -> 5c6207f6a
AIX has getopt in stdlib
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d3c6fb0b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d3c6fb0b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d3c6fb0b
Branch: refs/heads/master
Commit: d3c6fb0ba4443ab607e8a985e03870d8d6a4eec3
Parents: a515e19
Author: Steve Huston <sh...@riverace.com>
Authored: Thu Jan 29 20:35:44 2015 -0500
Committer: Steve Huston <sh...@riverace.com>
Committed: Thu Jan 29 20:35:44 2015 -0500
----------------------------------------------------------------------
examples/include/pncompat/misc_defs.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d3c6fb0b/examples/include/pncompat/misc_defs.h
----------------------------------------------------------------------
diff --git a/examples/include/pncompat/misc_defs.h b/examples/include/pncompat/misc_defs.h
index 1c01756..90b0d4e 100644
--- a/examples/include/pncompat/misc_defs.h
+++ b/examples/include/pncompat/misc_defs.h
@@ -37,10 +37,12 @@
#include <proton/types.h>
-#if !defined(_WIN32) || defined (__CYGWIN__)
-#include <getopt.h>
+#if defined(__IBMC__)
+# include <stdlib.h>
+#elif !defined(_WIN32) || defined (__CYGWIN__)
+# include <getopt.h>
#else
-#include "internal/getopt.h"
+# include "internal/getopt.h"
#endif
pn_timestamp_t time_now(void);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: Merge branch 'PROTON-809'
Posted by sh...@apache.org.
Merge branch 'PROTON-809'
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5c6207f6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5c6207f6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5c6207f6
Branch: refs/heads/master
Commit: 5c6207f6ac673af3922975cb5f2669a29ff96ebb
Parents: 7d5bf0a d3c6fb0
Author: Steve Huston <sh...@riverace.com>
Authored: Fri Jan 30 15:38:28 2015 -0500
Committer: Steve Huston <sh...@riverace.com>
Committed: Fri Jan 30 15:38:28 2015 -0500
----------------------------------------------------------------------
examples/include/pncompat/misc_defs.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org