#include <X11/X.h>
#include <X11/Xos.h>
#include <X11/keysymdef.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
-typedef unsigned long Signature;
+typedef uint32_t Signature;
#define KTNUM 4000
int ksnum = 0;
int max_rehash;
Signature sig;
- register int i, j, k, z;
- register char *name;
- register char c;
+ int i, j, k, z;
+ char *name;
+ char c;
int first;
int best_max_rehash;
int best_z = 0;
offsets[j] = k;
indexes[i] = k;
val = info[i].val;
- printf("0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, ",
+ printf("0x%.2"PRIx32", 0x%.2"PRIx32", 0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, ",
(sig >> 8) & 0xff, sig & 0xff,
(val >> 24) & 0xff, (val >> 16) & 0xff,
(val >> 8) & 0xff, val & 0xff);
xkb_string_to_keysym(const char *s)
{
int i, n, h, c, idx;
- unsigned long sig = 0;
+ uint32_t sig = 0;
const char *p = s;
const unsigned char *entry;
unsigned char sig1, sig2;