From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 15 Jan 2001 13:06:26 +0000 (+0000)
Subject: Missing from #8439.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e95af3626d8956c991c017085c9b5331e4f11c94;p=p5sagit%2Fp5-mst-13.2.git

Missing from #8439.

p4raw-id: //depot/perl@8443
---

diff --git a/keywords.h b/keywords.h
index 3343041..75540ed 100644
--- a/keywords.h
+++ b/keywords.h
@@ -155,98 +155,99 @@
 #define KEY_qq			154
 #define KEY_qr			155
 #define KEY_quotemeta		156
-#define KEY_qw			157
-#define KEY_qx			158
-#define KEY_rand		159
-#define KEY_read		160
-#define KEY_readdir		161
-#define KEY_readline		162
-#define KEY_readlink		163
-#define KEY_readpipe		164
-#define KEY_recv		165
-#define KEY_redo		166
-#define KEY_ref			167
-#define KEY_rename		168
-#define KEY_require		169
-#define KEY_reset		170
-#define KEY_return		171
-#define KEY_reverse		172
-#define KEY_rewinddir		173
-#define KEY_rindex		174
-#define KEY_rmdir		175
-#define KEY_s			176
-#define KEY_scalar		177
-#define KEY_seek		178
-#define KEY_seekdir		179
-#define KEY_select		180
-#define KEY_semctl		181
-#define KEY_semget		182
-#define KEY_semop		183
-#define KEY_send		184
-#define KEY_setgrent		185
-#define KEY_sethostent		186
-#define KEY_setnetent		187
-#define KEY_setpgrp		188
-#define KEY_setpriority		189
-#define KEY_setprotoent		190
-#define KEY_setpwent		191
-#define KEY_setservent		192
-#define KEY_setsockopt		193
-#define KEY_shift		194
-#define KEY_shmctl		195
-#define KEY_shmget		196
-#define KEY_shmread		197
-#define KEY_shmwrite		198
-#define KEY_shutdown		199
-#define KEY_sin			200
-#define KEY_sleep		201
-#define KEY_socket		202
-#define KEY_socketpair		203
-#define KEY_sort		204
-#define KEY_splice		205
-#define KEY_split		206
-#define KEY_sprintf		207
-#define KEY_sqrt		208
-#define KEY_srand		209
-#define KEY_stat		210
-#define KEY_study		211
-#define KEY_sub			212
-#define KEY_substr		213
-#define KEY_symlink		214
-#define KEY_syscall		215
-#define KEY_sysopen		216
-#define KEY_sysread		217
-#define KEY_sysseek		218
-#define KEY_system		219
-#define KEY_syswrite		220
-#define KEY_tell		221
-#define KEY_telldir		222
-#define KEY_tie			223
-#define KEY_tied		224
-#define KEY_time		225
-#define KEY_times		226
-#define KEY_tr			227
-#define KEY_truncate		228
-#define KEY_uc			229
-#define KEY_ucfirst		230
-#define KEY_umask		231
-#define KEY_undef		232
-#define KEY_unless		233
-#define KEY_unlink		234
-#define KEY_unpack		235
-#define KEY_unshift		236
-#define KEY_untie		237
-#define KEY_until		238
-#define KEY_use			239
-#define KEY_utime		240
-#define KEY_values		241
-#define KEY_vec			242
-#define KEY_wait		243
-#define KEY_waitpid		244
-#define KEY_wantarray		245
-#define KEY_warn		246
-#define KEY_while		247
-#define KEY_write		248
-#define KEY_x			249
-#define KEY_xor			250
-#define KEY_y			251
+#define KEY_qu			157
+#define KEY_qw			158
+#define KEY_qx			159
+#define KEY_rand		160
+#define KEY_read		161
+#define KEY_readdir		162
+#define KEY_readline		163
+#define KEY_readlink		164
+#define KEY_readpipe		165
+#define KEY_recv		166
+#define KEY_redo		167
+#define KEY_ref			168
+#define KEY_rename		169
+#define KEY_require		170
+#define KEY_reset		171
+#define KEY_return		172
+#define KEY_reverse		173
+#define KEY_rewinddir		174
+#define KEY_rindex		175
+#define KEY_rmdir		176
+#define KEY_s			177
+#define KEY_scalar		178
+#define KEY_seek		179
+#define KEY_seekdir		180
+#define KEY_select		181
+#define KEY_semctl		182
+#define KEY_semget		183
+#define KEY_semop		184
+#define KEY_send		185
+#define KEY_setgrent		186
+#define KEY_sethostent		187
+#define KEY_setnetent		188
+#define KEY_setpgrp		189
+#define KEY_setpriority		190
+#define KEY_setprotoent		191
+#define KEY_setpwent		192
+#define KEY_setservent		193
+#define KEY_setsockopt		194
+#define KEY_shift		195
+#define KEY_shmctl		196
+#define KEY_shmget		197
+#define KEY_shmread		198
+#define KEY_shmwrite		199
+#define KEY_shutdown		200
+#define KEY_sin			201
+#define KEY_sleep		202
+#define KEY_socket		203
+#define KEY_socketpair		204
+#define KEY_sort		205
+#define KEY_splice		206
+#define KEY_split		207
+#define KEY_sprintf		208
+#define KEY_sqrt		209
+#define KEY_srand		210
+#define KEY_stat		211
+#define KEY_study		212
+#define KEY_sub			213
+#define KEY_substr		214
+#define KEY_symlink		215
+#define KEY_syscall		216
+#define KEY_sysopen		217
+#define KEY_sysread		218
+#define KEY_sysseek		219
+#define KEY_system		220
+#define KEY_syswrite		221
+#define KEY_tell		222
+#define KEY_telldir		223
+#define KEY_tie			224
+#define KEY_tied		225
+#define KEY_time		226
+#define KEY_times		227
+#define KEY_tr			228
+#define KEY_truncate		229
+#define KEY_uc			230
+#define KEY_ucfirst		231
+#define KEY_umask		232
+#define KEY_undef		233
+#define KEY_unless		234
+#define KEY_unlink		235
+#define KEY_unpack		236
+#define KEY_unshift		237
+#define KEY_untie		238
+#define KEY_until		239
+#define KEY_use			240
+#define KEY_utime		241
+#define KEY_values		242
+#define KEY_vec			243
+#define KEY_wait		244
+#define KEY_waitpid		245
+#define KEY_wantarray		246
+#define KEY_warn		247
+#define KEY_while		248
+#define KEY_write		249
+#define KEY_x			250
+#define KEY_xor			251
+#define KEY_y			252
diff --git a/mg.c b/mg.c
index 4f183b0..9f05d3c 100644
--- a/mg.c
+++ b/mg.c
@@ -1433,7 +1433,7 @@ Perl_magic_setsubstr(pTHX_ SV *sv, MAGIC *mg)
     }
     else if (SvUTF8(lsv)) {
 	sv_pos_u2b(lsv, &lvoff, &lvlen);
-	tmps = bytes_to_utf8(tmps, &len);
+	tmps = (char*)bytes_to_utf8((U8*)tmps, &len);
 	sv_insert(lsv, lvoff, lvlen, tmps, len);
 	Safefree(tmps);
     }