RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 01-Jul-2007 20:19:58
Branch: HEAD Handle: 2007070119195700
Modified files:
rpm/misc fnmatch.c
Log:
With certain CFLAG combinations, "__stdchrnul" may suddenly exist in the
namespace. We need to avoid collisions.
Summary:
Revision Changes Path
1.9 +2 -2 rpm/misc/fnmatch.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/misc/fnmatch.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 fnmatch.c
--- rpm/misc/fnmatch.c 21 Feb 2005 15:23:30 -0000 1.8
+++ rpm/misc/fnmatch.c 1 Jul 2007 18:19:57 -0000 1.9
@@ -25,7 +25,7 @@
/* Find the first occurrence of C in S or the final NUL byte. */
static inline char *
-__strchrnul (const char *s, int c)
+internal__strchrnul (const char *s, int c)
{
const unsigned char *char_ptr;
const unsigned long int *longword_ptr;
@@ -353,7 +353,7 @@
{
const char *endp;
- endp = __strchrnul (n, (flags & FNM_FILE_NAME) ? '/' : '\0');
+ endp = internal__strchrnul (n, (flags & FNM_FILE_NAME) ? '/' :
'\0');
if (c == '[')
{
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
