diff --git a/src/sss/xtraveltime.c b/src/sss/xtraveltime.c index a6c9be2..58dedc6 100755 --- a/src/sss/xtraveltime.c +++ b/src/sss/xtraveltime.c @@ -28,7 +28,7 @@ #define MENTRY 40 void -truncate(char *s) { +sac_truncate(char *s) { char *p; if(!s) { return; @@ -254,7 +254,7 @@ xtraveltime( int *nerr) else if( lphase ){ if( lcchar( MTTLEN, (char*)kmtt.kphases[iphase],9, &nchar ) ) { phase_repeat = FALSE; - truncate(kmtt.kphases[iphase]); + sac_truncate(kmtt.kphases[iphase]); for(i = 0; i < iphase; i++) { if(strcmp(kmtt.kphases[iphase], kmtt.kphases[i]) == 0) { phase_repeat = TRUE; @@ -362,7 +362,7 @@ xtraveltime( int *nerr) cmtt.ttdep = *evdp; } for(i = 0; i < cmtt.nphases; i++) { - truncate(kmtt.kphases[i]); + sac_truncate(kmtt.kphases[i]); } if(!quiet) { @@ -696,7 +696,7 @@ L_7777: trtm(*gcarc, MAX_PHASES, &n, tt, dtdd, dtdh, dddp, (char *) names, 9); k = nPickStart; for(i = 0; i < n; i++) { - truncate(names[i]); + sac_truncate(names[i]); } /* Specificed phases */ for(j = 0; j < cmtt.nphases; j++) { diff --git a/libedit/libedit-20090923-3.0-sac/src/vi.c b/libedit/libedit-20090923-3.0-sac/src/vi.c index a6c9be2..58dedc6 100755 --- a/libedit/libedit-20090923-3.0-sac/src/vi.c +++ b/libedit/libedit-20090923-3.0-sac/src/vi.c @@ -916,17 +916,17 @@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference -extern char *get_alias_text(const char *) __weak_reference(get_alias_text); -#endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +/*#ifdef __weak_reference*/ +#ifdef __weak_extern char alias_name[3]; char *alias_text; + extern char *get_alias_text(const char *); + __weak_extern(get_alias_text); if (get_alias_text == 0) { return CC_ERROR; }