Error compiling on Linux

[3vi1]

I've compiled/installed OpenCBM on Ubuntu 18.10 (alpha), but see the following issue compiling nibtools (markusC64-v637-branch).

make -f GNU/Makefile linux

...
bitshifter.c: In function ‘ShiftCopyXBitsFromPBtoQC’:
bitshifter.c:442:14: error: ‘__int32’ undeclared (first use in this function); did you mean ‘__int32_t’?
   **q = ( ( (__int32)((**q) >> (8-*c)) << 8) | (((__int32)db << (*b-1)) & 0xff) ) >> *c;
              ^~~~~~~
              __int32_t
...

If I change the type, I get another error:

read.c: In function ‘get_disk_id’:
read.c:471:8: error: too few arguments to function ‘extract_id’
   if (!extract_id(buffer, diskid))
        ^~~~~~~~~~

So, I haven't tried to workaround further.