diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-25 16:32:32 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-03-14 08:52:46 +0200 |
| commit | ffe7853a48540d186f99d86ee9801b5f00135d9c (patch) | |
| tree | b506e3f55dadd49e3e03d764ce8a7c7b945e0a39 /usr/src | |
| parent | a522dae157f0619c63fd51d4b80abc2ded60ec51 (diff) | |
| download | illumos-joyent-ffe7853a48540d186f99d86ee9801b5f00135d9c.tar.gz | |
13549 vi: multiply-defined symbols
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Rich Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/vi/port/ex.h | 15 | ||||
| -rw-r--r-- | usr/src/cmd/vi/port/ex_subr.c | 13 |
2 files changed, 17 insertions, 11 deletions
diff --git a/usr/src/cmd/vi/port/ex.h b/usr/src/cmd/vi/port/ex.h index 65dc0edd01..ea93b2a662 100644 --- a/usr/src/cmd/vi/port/ex.h +++ b/usr/src/cmd/vi/port/ex.h @@ -24,7 +24,7 @@ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* Copyright (c) 1981 Regents of the University of California */ @@ -372,7 +372,7 @@ var int crflag; /* True if the key has been accepted and the file var int perm[2]; /* pipe connection to crypt for file being edited */ var int tperm[2]; /* pipe connection to crypt for temporary file */ var int permflag; -var int tpermflag; +var int tpermflag; var unsigned char *key; var unsigned char crbuf[CRSIZE]; char *getpass(); @@ -399,10 +399,10 @@ int (*setnorm())(); int (*setnorm())(); int (*setnumb())(); #ifndef PRESUNEUC -int (*wdwc)(wchar_t); /* tells kind of word character */ -int (*wdbdg)(wchar_t, wchar_t, int); /* tells word binding force */ -wchar_t *(*wddlm)(wchar_t, wchar_t, int); /* tells desired delimiter */ -wchar_t (*mcfllr)(void); /* tells multicolumn filler character */ +extern int (*wdwc)(wchar_t); /* tells kind of word character */ +extern int (*wdbdg)(wchar_t, wchar_t, int); /* tells word binding force */ +extern wchar_t *(*wddlm)(wchar_t, wchar_t, int); /* tells desired delimiter */ +extern wchar_t (*mcfllr)(void); /* tells multicolumn filler character */ #endif /* PRESUNEUC */ line *address(); unsigned char *cgoto(); @@ -459,7 +459,7 @@ int vshftop(); int yank(void); unsigned char *lastchr(); unsigned char *nextchr(); -bool putoctal; +extern bool putoctal; void error(); void error0(void); @@ -603,7 +603,6 @@ void vclear(void); unsigned char *lastchr(); unsigned char *nextchr(); -bool putoctal; void setdot1(void); diff --git a/usr/src/cmd/vi/port/ex_subr.c b/usr/src/cmd/vi/port/ex_subr.c index 3f0980a825..bc99bbf8fb 100644 --- a/usr/src/cmd/vi/port/ex_subr.c +++ b/usr/src/cmd/vi/port/ex_subr.c @@ -24,7 +24,7 @@ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* Copyright (c) 1981 Regents of the University of California */ @@ -47,6 +47,13 @@ #include "ex_tty.h" #include "ex_vis.h" +#ifndef PRESUNEUC +int (*wdwc)(wchar_t); +int (*wdbdg)(wchar_t, wchar_t, int); +wchar_t *(*wddlm)(wchar_t, wchar_t, int); +wchar_t (*mcfllr)(void); +#endif /* PRESUNEUC */ + /* * Random routines, in alphabetical order. */ @@ -588,7 +595,7 @@ qcolumn(unsigned char *lim, unsigned char *gp) col = 0; vcntcol = vcntcol - col + 1; } - if (gp) + if (gp) while (*gp) { length = mbtowc(&wchar, (char *)gp, MULTI_BYTE_MAX); if(length < 0) { @@ -628,7 +635,7 @@ nqcolumn(unsigned char *lim, unsigned char *gp) pline(0); if (lim != NULL) lim[length] = x; - if (gp) + if (gp) while (*gp) { length = mbtowc(&wchar, (char *)gp, MULTI_BYTE_MAX); if(length < 0) { |