Skip to content

Commit a075741

Browse files
committed
Rename str_join -> strjoin to make it not clash with objstr's one.
1 parent af19cbd commit a075741

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

unix/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static void execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind
8181
}
8282
}
8383

84-
static char *str_join(const char *s1, int sep_char, const char *s2) {
84+
static char *strjoin(const char *s1, int sep_char, const char *s2) {
8585
int l1 = strlen(s1);
8686
int l2 = strlen(s2);
8787
char *s = m_new(char, l1 + l2 + 2);
@@ -133,7 +133,7 @@ static void do_repl(void) {
133133
if (line2 == NULL || strlen(line2) == 0) {
134134
break;
135135
}
136-
char *line3 = str_join(line, '\n', line2);
136+
char *line3 = strjoin(line, '\n', line2);
137137
free(line);
138138
free(line2);
139139
line = line3;

0 commit comments

Comments
 (0)