From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sat, 24 Mar 2012 13:23:50 +0000 (-0400)
Subject: softsig: not used on windows
X-Git-Tag: upstream/1.8.0_pre1^2~2687
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d0ea3b18e2893943f9deb46244f2674db1920622;p=packages%2Fo%2Fopenafs.git

softsig: not used on windows

Do not install afs/softsig.h on Windows from src/util

Do not include it in src/viced/viced.c

Change-Id: I8b6dcb1508dcda7da297a0c9a6bfeaf037c40c88
Reviewed-on: http://gerrit.openafs.org/6950
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index ca53965ab..edbb01357 100644
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -26,8 +26,7 @@ INCFILES =\
 	$(INCFILEDIR)\ktime.h \
 	$(INCFILEDIR)\fileutil.h \
 	$(INCFILEDIR)\afsutil_prototypes.h \
-	$(INCFILEDIR)\secutil_nt.h \
-        $(INCFILEDIR)\softsig.h
+	$(INCFILEDIR)\secutil_nt.h
 
 $(DESTDIR)\include\dirent.h: dirent_nt.h
 	$(COPY) $** $@
diff --git a/src/viced/viced.c b/src/viced/viced.c
index f8e1c8d2d..d4db153f6 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -69,11 +69,11 @@
 #include <afs/dir.h>
 #ifndef AFS_NT40_ENV
 # include <afs/netutils.h>
+# include <afs/softsig.h>
 #endif
 #include "viced_prototypes.h"
 #include "viced.h"
 #include "host.h"
-#include <afs/softsig.h>
 #if defined(AFS_SGI_ENV)
 # include "sys/schedctl.h"
 # include "sys/lock.h"