diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-09-11 06:56:40 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-09-11 06:56:40 +0400 |
| commit | bd79b736d4f7d223f34850db9a0805455fc2b3db (patch) | |
| tree | 11709b4f6659dba627ea556bbd58fc01aa7e0047 | |
| parent | b07b167eec8af05999373a511f9e8fad48285caf (diff) | |
* Makefile.in (cygcheck.o): Use MINGW_CXX for compilation.
* cygcheck.cc: Just include <getopt.h> rather than cygwin version.
(pretty_id): Avoid compiler warnings.
* cygpath.cc (usage): Ditto.
| -rw-r--r-- | winsup/utils/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 6 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 6 | ||||
| -rw-r--r-- | winsup/utils/cygpath.cc | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index b43371b21..58d941a54 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,12 @@ 2003-09-10 Christopher Faylor <cgf@redhat.com> + * Makefile.in (cygcheck.o): Use MINGW_CXX for compilation. + * cygcheck.cc: Just include <getopt.h> rather than cygwin version. + (pretty_id): Avoid compiler warnings. + * cygpath.cc (usage): Ditto. + +2003-09-10 Christopher Faylor <cgf@redhat.com> + * Makefile.in (MINGW_CXX): Define and use for mingw-compiled files. * path.cc: Include more path info in cygwin-specific includes since the cygwin directory is no longer included by default. diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 0641049ee..a9765c115 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -152,10 +152,10 @@ endif cygcheck.o: cygcheck.cc ifdef VERBOSE - ${CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< + ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< else - @echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ - ${CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< + @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ + ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< endif strace.o: strace.cc diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 006bc15e0..693bd237e 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -16,9 +16,9 @@ #include <io.h> #include <windows.h> #include "path.h" +#include <getopt.h> #include "cygwin/include/sys/cygwin.h" #include "cygwin/include/mntent.h" -#include "cygwin/include/getopt.h" int verbose = 0; int registry = 0; @@ -775,7 +775,7 @@ pretty_id (const char *s, char *cygwin, size_t cyglen) putenv (cygwin); char *id = cygpath ("/bin/id.exe", NULL); - for (char *p = id; p = strchr (p, '/'); p++) + for (char *p = id; (p = strchr (p, '/')); p++) *p = '\\'; if (access (id, X_OK)) @@ -805,7 +805,7 @@ pretty_id (const char *s, char *cygwin, size_t cyglen) } printf ("\nOutput from %s (%s)\n", id, s); - int szmaybe = strlen ("UID: ") + strlen (uid); + size_t szmaybe = strlen ("UID: ") + strlen (uid); if (sz < szmaybe) sz = szmaybe; sz += 1; diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc index 9d9c1903f..68a2407fc 100644 --- a/winsup/utils/cygpath.cc +++ b/winsup/utils/cygpath.cc @@ -66,7 +66,7 @@ usage (FILE * stream, int status) Usage: %s (-d|-m|-u|-w|-t TYPE) [-c HANDLE] [-f FILE] [options] NAME\n\ %s [-ADHPSW] \n\ Convert Unix and Windows format paths, or output system path information\n\ -\n\ +\n\ Output type options:\n\ -d, --dos print DOS (short) form of NAME (C:\\PROGRA~1\\)\n\ -m, --mixed like --windows, but with regular slashes (C:/WINNT)\n\ |