From 4ee51bdf46144d4586843e490b3bb1fd23ffd585 Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Thu, 6 Oct 2005 07:28:30 +0000 Subject: [PATCH] Added a CYGWIN define to include header files required to build in a Cygwin environment --- config.h | 2 +- lib/libalpm/add.c | 3 +++ lib/libalpm/conflict.c | 3 +++ lib/libalpm/remove.c | 3 +++ lib/libalpm/sync.c | 3 +++ lib/libalpm/util.c | 3 +++ src/pacman/pacman.c | 9 +++++++++ src/pacman/sync.c | 3 +++ src/pacman/util.c | 3 +++ 9 files changed, 31 insertions(+), 1 deletion(-) diff --git a/config.h b/config.h index 703fe6fa..e59a0e58 100644 --- a/config.h +++ b/config.h @@ -2,4 +2,4 @@ #define HAVE_LOCALE_H 1 #define HAVE_SETLOCALE 1 #define HAVE_STRVERSCMP 1 - +#undef CYGWIN diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 80350d1b..af7d6b0b 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -25,6 +25,9 @@ #include #include #include +#ifdef CYGWIN +#include /* PATH_MAX */ +#endif #include #include /* pacman */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 0d614e3f..3408c676 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -23,6 +23,9 @@ #include #include #include +#ifdef CYGWIN +#include /* PATH_MAX */ +#endif #include /* pacman */ #include "util.h" diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a622a4f4..fd00eae1 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -25,6 +25,9 @@ #include #include #include +#ifdef CYGWIN +#include /* PATH_MAX */ +#endif #include #include /* pacman */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 20d5a64b..0be24b79 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -24,6 +24,9 @@ #include #include #include +#ifdef CYGWIN +#include /* PATH_MAX */ +#endif #include #include /* pacman */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index a4b9e0ff..4836812e 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -30,6 +30,9 @@ #include #include #include +#ifdef CYGWIN +#include /* PATH_MAX */ +#endif #include #include /* pacman */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 39de1f0e..89033813 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -19,13 +19,18 @@ * USA. */ +#include "config.h" #include #include #include #include #include #include +#ifndef CYGWIN #include /* debug */ +#else +#include /* basename */ +#endif #include /* pacman */ @@ -92,8 +97,10 @@ int main(int argc, char *argv[]) int ret = 0; char *cenv = NULL; +#ifndef CYGWIN /* debug */ mtrace(); +#endif cenv = getenv("COLUMNS"); if(cenv != NULL) { @@ -226,8 +233,10 @@ void cleanup(int signum) FREELIST(pm_targets); +#ifndef CYGWIN /* debug */ muntrace(); +#endif fflush(stdout); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fb00c78d..17b9b3a2 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -26,6 +26,9 @@ #include #include #include +#ifdef CYGWIN +#include /* PATH_MAX */ +#endif #include /* pacman */ diff --git a/src/pacman/util.c b/src/pacman/util.c index cbfaa3e5..1d3844a3 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -29,6 +29,9 @@ #include #include #include +#ifdef CYGWIN +#include /* PATH_MAX */ +#endif /* pacman */ #include "util.h"