From 78d67ff870f54564d35efb9771c846710e88b0c0 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 17 Jan 2017 18:28:28 +1100 Subject: getopt.c: Pointer comparison fix * Remove because MSVC 2005 (and probably 2008) don't have it. * Fix pointer difference caclulation between `nameend` and `nextchar`. Patch-from: lvqcl --- src/share/getopt/getopt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/share/getopt/getopt.c b/src/share/getopt/getopt.c index 7928ad33..23c119c0 100644 --- a/src/share/getopt/getopt.c +++ b/src/share/getopt/getopt.c @@ -54,7 +54,6 @@ #endif #include -#include /* Comment out all this code if we are using the GNU C Library, and are not actually compiling the library itself. This code is part of the GNU C @@ -664,8 +663,7 @@ share___getopt_internal (argc, argv, optstring, longopts, longind, long_only) for (p = longopts, option_index = 0; p->name; p++, option_index++) if (!strncmp (p->name, nextchar, nameend - nextchar)) { - if ((uint32_t) (nameend - nextchar) - == (uint32_t) strlen (p->name)) + if ((size_t) (nameend - nextchar) == strlen (p->name)) { /* Exact match found. */ pfound = p; @@ -853,7 +851,7 @@ share___getopt_internal (argc, argv, optstring, longopts, longind, long_only) for (p = longopts, option_index = 0; p->name; p++, option_index++) if (!strncmp (p->name, nextchar, nameend - nextchar)) { - if ((uint32_t) (nameend - nextchar) == strlen (p->name)) + if ((size_t) (nameend - nextchar) == strlen (p->name)) { /* Exact match found. */ pfound = p; -- cgit v1.2.1