summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarnie Boyd <earnie@users.sf.net>2003-03-11 14:44:58 +0000
committerEarnie Boyd <earnie@users.sf.net>2003-03-11 14:44:58 +0000
commit296b2a5f17305b187f6a190108161cd3ba055d01 (patch)
tree4699553c4cc0e4f7de9f3a53d6180b041eff56b1
parent2afa7f58828c67b33214e3ba10d71fa59909db97 (diff)
downloadcygnal-296b2a5f17305b187f6a190108161cd3ba055d01.tar.gz
cygnal-296b2a5f17305b187f6a190108161cd3ba055d01.tar.bz2
cygnal-296b2a5f17305b187f6a190108161cd3ba055d01.zip
* include/winsvc.h (SERVICE_NO_CHANGE): Use hex constant to avoid
warnings. Thanks to Fabricio D. Rossi <gurusoda@users.sf.net>. * Makefile.in (bindist): Correct process. * lib/Makefile.in (install): Ditto. Thanks to Jeff Bonnggren <jbon@users.sf.net>.
-rw-r--r--winsup/w32api/ChangeLog9
-rw-r--r--winsup/w32api/Makefile.in2
-rw-r--r--winsup/w32api/include/winsvc.h2
-rw-r--r--winsup/w32api/lib/Makefile.in4
4 files changed, 13 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8a65cf65a..1d8225dd4 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-11 Earnie Boyd <earnie@users.sf.net>
+
+ * include/winsvc.h (SERVICE_NO_CHANGE): Use hex constant to avoid
+ warnings.
+ Thanks to Fabricio D. Rossi <gurusoda@users.sf.net>.
+ * Makefile.in (bindist): Correct process.
+ * lib/Makefile.in (install): Ditto.
+ Thanks to Jeff Bonnggren <jbon@users.sf.net>.
+
2003-03-10 Danny Smith <dannysmith@users.sourceforge.net>
* include/rasdlg.h: New file.
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index 30716a1b4..3dcdfb286 100644
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -130,7 +130,7 @@ bindist:
rm -rf $(distdir)
mkdir $(distdir)
chmod 755 $(distdir)
- $(MAKE) install prefix=../$(distdir)$(dist_prefix) exec_prefix=../$(distdir)$(dist_prefix)
+ $(MAKE) install prefix=`pwd`/$(distdir)$(dist_prefix) exec_prefix=`pwd`/$(distdir)$(dist_prefix)
rm -f $(distdir)$(TARFILEEXT)
cd $(distdir); $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) *
diff --git a/winsup/w32api/include/winsvc.h b/winsup/w32api/include/winsvc.h
index 7e41eab4c..cfc3f57a9 100644
--- a/winsup/w32api/include/winsvc.h
+++ b/winsup/w32api/include/winsvc.h
@@ -20,7 +20,7 @@ extern "C" {
#define SC_MANAGER_LOCK 8
#define SC_MANAGER_QUERY_LOCK_STATUS 16
#define SC_MANAGER_MODIFY_BOOT_CONFIG 32
-#define SERVICE_NO_CHANGE (-1)
+#define SERVICE_NO_CHANGE 0xffffffff
#define SERVICE_STOPPED 1
#define SERVICE_START_PENDING 2
#define SERVICE_STOP_PENDING 3
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index fc33a5269..a333c959e 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -135,7 +135,7 @@ ddk:
TEST_OPTIONS = $(ALL_CFLAGS) -DWINVER=0x0666 \
-Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
-.PHONY: test
+.PHONY: test ddk
test:
@echo "Testing w32api..."
@for lang in c c++ objective-c ; do \
@@ -193,7 +193,7 @@ install-headers:
done
install-ddk: install-libraries install-headers
- (cd ddk && $(MAKE) install $(FLAGS_TO_PASS) prefix=../$(prefix) exec_prefix=../$(exec_prefix))
+ cd ddk && $(MAKE) install $(FLAGS_TO_PASS)
# uninstall headers and libraries from a target specified directory
uninstall: uninstall-ddk uninstall-libraries uninstall-headers