X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fcheck-version.c;h=740f7c5875833641568d3f85d302c1f70fe51733;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=b54f2e55de0c8a0b3c6c60e22813184062670c59;hpb=e5e3c71d407361f126e61ded83ca7d9d61ff0bca;p=gnulib.git diff --git a/lib/check-version.c b/lib/check-version.c index b54f2e55d..740f7c587 100644 --- a/lib/check-version.c +++ b/lib/check-version.c @@ -1,6 +1,6 @@ /* check-version.h --- Check version string compatibility. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free - Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, + 2009, 2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,27 +20,24 @@ gcry_check_version from Werner Koch's Libgcrypt. Paul Eggert suggested the use of strverscmp to simplify implementation. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include #include -#include +#include /* Get specification. */ -#include "check_version.h" - -/* Check that the the version of the library (i.e., the CPP symbol - * VERSION) is at minimum the requested one in REQ_VERSION (typically - * found in a header file) and return the version string. Return NULL - * if the condition is not satisfied. If a NULL is passed to this - * function, no check is done, but the version string is simply - * returned. +#include "check-version.h" + +/* Check that the version of the library (i.e., the CPP symbol VERSION) + * is at minimum the requested one in REQ_VERSION (typically found in + * a header file) and return the version string. Return NULL if the + * condition is not satisfied. If a NULL is passed to this function, + * no check is done, but the version string is simply returned. */ const char * check_version (const char *req_version) { - if (!req_version || strverscmp (req_version, VERSION) < 0) + if (!req_version || strverscmp (req_version, VERSION) <= 0) return VERSION; return NULL;