diff options
| author |   sthen <sthen@openbsd.org> | 2013-03-25 20:40:40 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2013-03-25 20:40:40 +0000 |
| commit | 48950c12d106c85f315112191a0228d7b83b9510 (patch) | |
| tree | 54e43d54484c1bfe9bb06a10ede0ba3e2fa52c08 /gnu/usr.bin/perl/os2/os2.c | |
| parent | avoid null dereference affecting mod_perl, Perl RT bug 116441 (diff) | |
| download | wireguard-openbsd-48950c12d106c85f315112191a0228d7b83b9510.tar.xz wireguard-openbsd-48950c12d106c85f315112191a0228d7b83b9510.zip | |
merge/resolve conflicts
(some more to do after this one)
Diffstat (limited to 'gnu/usr.bin/perl/os2/os2.c')
| -rw-r--r-- | gnu/usr.bin/perl/os2/os2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/perl/os2/os2.c b/gnu/usr.bin/perl/os2/os2.c index 9448fdc717b..ea730afc0bf 100644 --- a/gnu/usr.bin/perl/os2/os2.c +++ b/gnu/usr.bin/perl/os2/os2.c @@ -3720,7 +3720,7 @@ fill_extLibpath(int type, char *pre, char *post, int replace, char *msg) s = pre - 1; while (*++s) if (*s == '/') - *s = '\\'; /* Be extra causious */ + *s = '\\'; /* Be extra cautious */ memcpy(to, pre, l); if (!l || to[l-1] != ';') to[l++] = ';'; @@ -3751,7 +3751,7 @@ fill_extLibpath(int type, char *pre, char *post, int replace, char *msg) s = post - 1; while (*++s) if (*s == '/') - *s = '\\'; /* Be extra causious */ + *s = '\\'; /* Be extra cautious */ memcpy(to, post, l); if (!l || to[l-1] != ';') to[l++] = ';'; |