1
0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-25 23:21:29 +03:00

M #-: Change u_int16_t type for uint16_t

The types `u_intXX_t` (underscore after the `u`) are not supported
  by newer versions of GCC and `uintXX_t` should be used instead.
  In the file `src/svncterm_server/genfont.c` there were still some
  variables using the old type `u_int16_t`. They have been fixed.

(cherry picked from commit 8f7463fcc4)
This commit is contained in:
bruno 2023-03-20 13:07:17 +01:00 committed by Ruben S. Montero
parent 03d5e644d1
commit 5489c34803
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87

View File

@ -35,6 +35,7 @@
#include <string.h>
#include <linux/limits.h>
#include <getopt.h>
#include <stdint.h>
/* -------------------------------------------------------------------------- */
/* Font glyph storage array and map pointer */
@ -104,11 +105,11 @@ static int font_add_glyph (const char *data, unsigned int gsize)
* Convert UTF8 to (1, 2 & 3 bytes) Unicode char
* Return 0 success, -1 not ucode, -2 EOU (end of unicode)
*/
static int utf8_2_unicode(gzFile stream, char s, u_int16_t * ucode)
static int utf8_2_unicode(gzFile stream, char s, uint16_t * ucode)
{
char s1, s2;
*ucode = (u_int16_t) s;
*ucode = (uint16_t) s;
if (*ucode == 0xFFFF)
{
@ -228,7 +229,7 @@ static int load_psf_font (const char *filename, int is_default)
while (gzread(f, &s, 1) == 1)
{
u_int16_t uchar;
uint16_t uchar;
int rc = utf8_2_unicode(f, s, &uchar);