diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-04-01 04:30:37 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-04-01 04:30:37 +0000 |
| commit | d06c6b56a58e87fbae4f1643e3509df451e4f102 (patch) | |
| tree | 6303eef1b5a8897f01c24e35196471fd26cd641f | |
| parent | 7a66e563e1ee7b8664ec3b1e2c2c66e442de3d48 (diff) | |
| download | nspr-hg-d06c6b56a58e87fbae4f1643e3509df451e4f102.tar.gz | |
Bugzilla bug #4297: the use of 'stack' as function arguments conflicts
with the class name 'stack' in STL, so renamed it to 'fd_stack'.
Thanks to joseph.gregorio@mts.com for reporting the problem and
suggesting a fix.
| -rw-r--r-- | pr/include/prio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pr/include/prio.h b/pr/include/prio.h index 1cb39852..8da9deed 100644 --- a/pr/include/prio.h +++ b/pr/include/prio.h @@ -458,7 +458,7 @@ PR_EXTERN(PRFileDesc*) PR_GetSpecialFD(PRSpecialFD id); PR_EXTERN(PRDescIdentity) PR_GetUniqueIdentity(const char *layer_name); PR_EXTERN(const char*) PR_GetNameForIdentity(PRDescIdentity ident); PR_EXTERN(PRDescIdentity) PR_GetLayersIdentity(PRFileDesc* fd); -PR_EXTERN(PRFileDesc*) PR_GetIdentitiesLayer(PRFileDesc* stack, PRDescIdentity id); +PR_EXTERN(PRFileDesc*) PR_GetIdentitiesLayer(PRFileDesc* fd_stack, PRDescIdentity id); /* ************************************************************************** @@ -497,7 +497,7 @@ PR_EXTERN(PRFileDesc*) PR_CreateIOLayerStub( ************************************************************************** */ PR_EXTERN(PRStatus) PR_PushIOLayer( - PRFileDesc *stack, PRDescIdentity id, PRFileDesc *layer); + PRFileDesc *fd_stack, PRDescIdentity id, PRFileDesc *layer); /* ************************************************************************** @@ -513,7 +513,7 @@ PR_EXTERN(PRStatus) PR_PushIOLayer( * that file descriptor will remain valid. ************************************************************************** */ -PR_EXTERN(PRFileDesc*) PR_PopIOLayer(PRFileDesc *stack, PRDescIdentity id); +PR_EXTERN(PRFileDesc*) PR_PopIOLayer(PRFileDesc *fd_stack, PRDescIdentity id); /* ************************************************************************** |