summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2018-05-14 19:19:50 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2018-05-14 19:19:50 +0200
commit7e33a75e36a301043ea4b6048d05cace106e3519 (patch)
tree1ff6d4c2d7b5a73d475440fd629229e1b710814e
parentc9bb6f68ebdfcdb4682aa2eb7d16419863768449 (diff)
parenta4b93e543be46b4b6c7a8bf639f585501b0dd712 (diff)
merge
-rw-r--r--lib/keyboard5
-rw-r--r--sys/src/cmd/audio/pcmconv/pcmconv.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/keyboard b/lib/keyboard
index 6630c76d3..53cd22f32 100644
--- a/lib/keyboard
+++ b/lib/keyboard
@@ -165,6 +165,8 @@
014D _o ō latin small letter o macron
014E uO Ŏ latin capital letter o breve
014F uo ŏ latin small letter o breve
+0150 hO Ő latin capital letter o double acute
+0151 ho ő latin small letter o double acute
0152 OE Œ latin capital letter o e
0153 oe œ latin small letter o e
0154 'R Ŕ latin capital letter r acute
@@ -426,6 +428,7 @@
208C b= ₌ subscript equals sign
208D b( ₍ subscript opening parenthesis
208E b) ₎ subscript closing parenthesis
+208F bN ₏ subscript latin small letter n
20AC e$ € euro symbol
2102 CC ℂ double-struck capital c
210A $g ℊ script small g
@@ -548,6 +551,8 @@
262D SU ☭ hammer and sickle
2639 :( ☹ sad face
263A :) ☺ smiley face
+2640 fs ♀ female sign
+2642 ms ♂ male sign
2654 wk ♔ white chess king
2655 wq ♕ white chess queen
2656 wr ♖ white chess rook
diff --git a/sys/src/cmd/audio/pcmconv/pcmconv.c b/sys/src/cmd/audio/pcmconv/pcmconv.c
index 3adda141a..dcd088f05 100644
--- a/sys/src/cmd/audio/pcmconv/pcmconv.c
+++ b/sys/src/cmd/audio/pcmconv/pcmconv.c
@@ -355,7 +355,7 @@ ficonv(int *dst, uchar *src, int bits, int skip, int count)
else if(d < -1.0)
*dst++ = MININT;
else
- *dst++ = d*((float)MAXINT);
+ *dst++ = d*((double)MAXINT);
}
}
}