Module: ppl/ppl Branch: master Commit: b4e36692e7cea11a2b59ae62e69de7d13f2a7799 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b4e36692e7cea...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Sun Mar 29 09:29:37 2009 +0200

Try to accommodate more non-GNU implementations of `getopt()'.

---

demos/ppl_lcdd/ppl_lcdd.cc | 6 +++--- demos/ppl_lpsol/ppl_lpsol.c | 6 +++--- src/ppl-config.cc.in | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 6a149ae..e174030 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -108,15 +108,15 @@ typedef Polyhedron* POLYHEDRON_TYPE; #include <getopt.h>

// Try to accommodate non-GNU implementations of `getopt()'. -#if !defined(no_argument) +#if !defined(no_argument) && defined(NO_ARG) #define no_argument NO_ARG #endif

-#if !defined(required_argument) +#if !defined(required_argument) && defined(REQUIRED_ARG) #define required_argument REQUIRED_ARG #endif

-#if !defined(optional_argument) +#if !defined(optional_argument) && defined(OPTIONAL_ARG) #define optional_argument OPTIONAL_ARG #endif

diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index b5cf668..935cf9b 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -43,15 +43,15 @@ site: http://www.cs.unipr.it/ppl/ . */ # include <getopt.h>

/* Try to accommodate non-GNU implementations of `getopt()'. */ -#if !defined(no_argument) +#if !defined(no_argument) && defined(NO_ARG) #define no_argument NO_ARG #endif

-#if !defined(required_argument) +#if !defined(required_argument) && defined(REQUIRED_ARG) #define required_argument REQUIRED_ARG #endif

-#if !defined(optional_argument) +#if !defined(optional_argument) && defined(OPTIONAL_ARG) #define optional_argument OPTIONAL_ARG #endif

diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index 629416f..e175d57 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -42,15 +42,15 @@ namespace PPL = Parma_Polyhedra_Library; #include <getopt.h>

// Try to accommodate non-GNU implementations of `getopt()'. -#if !defined(no_argument) +#if !defined(no_argument) && defined(NO_ARG) #define no_argument NO_ARG #endif

-#if !defined(required_argument) +#if !defined(required_argument) && defined(REQUIRED_ARG) #define required_argument REQUIRED_ARG #endif

-#if !defined(optional_argument) +#if !defined(optional_argument) && defined(OPTIONAL_ARG) #define optional_argument OPTIONAL_ARG #endif