[pacman-dev] [PATCH 1/4] Remove Cygwin support

Allan McRae allan at archlinux.org
Sun Dec 16 07:36:40 EST 2012


Signed-off-by: Allan McRae <allan at archlinux.org>
---
 configure.ac        | 5 -----
 src/pacman/pacman.c | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index faa0792..122f387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,10 +309,6 @@ case "${host_os}" in
 		SIZECMD="stat -f %z"
 		SEDINPLACE="sed -i \"\""
 		;;
-	cygwin*)
-		host_os_cygwin=yes
-		AC_DEFINE([CYGWIN], [1], [Define if host OS is cygwin])
-		;;
 	darwin*)
 		host_os_darwin=yes
 		INODECMD="/usr/bin/stat -f '%i %n'"
@@ -324,7 +320,6 @@ case "${host_os}" in
 		;;
 esac
 
-AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
 AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
 AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] )
 AC_SUBST(INODECMD)
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 29a489b..e3293a0 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -758,8 +758,7 @@ int main(int argc, char *argv[])
 	size_t i;
 	struct sigaction new_action, old_action;
 	const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV };
-#if defined(HAVE_GETEUID) && !defined(CYGWIN)
-	/* geteuid undefined in CYGWIN */
+#if defined(HAVE_GETEUID)
 	uid_t myuid = geteuid();
 #endif
 
@@ -881,7 +880,7 @@ int main(int argc, char *argv[])
 		config->logmask &= ~ALPM_LOG_WARNING;
 	}
 
-#if defined(HAVE_GETEUID) && !defined(CYGWIN)
+#if defined(HAVE_GETEUID)
 	/* check if we have sufficient permission for the requested operation */
 	if(myuid > 0 && needs_root()) {
 		pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n"));
-- 
1.8.0.2



More information about the pacman-dev mailing list