Package: plptools
Version: 0.14-1
Severity: serious
Tags: patch
When building 'plptools' on amd64/unstable,
I get the following error:
g++ -DHAVE_CONFIG_H -I. -I. -I../include -I../intl -MT psitime.lo -MD -MP -MF
.deps/psitime.Tpo -c psitime.cc -fPIC -DPIC -o .libs/psitime.o
../include/plp_inttypes.h:30: error: conflicting declaration 'typedef long long
unsigned int u_int64_t'
/usr/include/sys/types.h:200: error: 'u_int64_t' has a previous declaration as
'typedef long unsigned int u_int64_t'
make[2]: *** [psitime.lo] Error 1
make[2]: Leaving directory `/plptools-0.14/lib'
With the attached patch 'plptools' can be compiled on amd64.
Regards
Andreas Jochens
diff -urN ../tmp-orig/plptools-0.14/include/plp_inttypes.h
./include/plp_inttypes.h
--- ../tmp-orig/plptools-0.14/include/plp_inttypes.h 2004-05-31
13:37:08.000000000 +0000
+++ ./include/plp_inttypes.h 2005-09-25 08:36:21.000000000 +0000
@@ -15,21 +15,10 @@
#include <sys/int_types.h>
#endif
-#ifndef GNU_INTTYPES
-#ifdef ISO_INTTYPES
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t;
typedef uint64_t u_int64_t;
typedef int64_t s_int64_t;
-#else
-/* Last resort, declare ourselves */
-typedef unsigned char u_int8_t;
-typedef unsigned short u_int16_t;
-typedef unsigned int u_int32_t;
-typedef unsigned long long u_int64_t;
-typedef signed long long s_int64_t;
-#endif // ISO_INTTYPES
-#endif // GNU_INTTYPES
#endif // _INTTYPES_H_
diff -urN ../tmp-orig/plptools-0.14/ncpd/ncp.cc ./ncpd/ncp.cc
--- ../tmp-orig/plptools-0.14/ncpd/ncp.cc 2004-05-31 13:37:09.000000000
+0000
+++ ./ncpd/ncp.cc 2005-09-25 08:36:54.000000000 +0000
@@ -381,7 +381,7 @@
bool ncp::
isValidChannel(int channel)
{
- return (channelPtr[channel] && ((int)channelPtr[channel] != 0xdeadbeef));
+ return (channelPtr[channel] && ((long)channelPtr[channel] != 0xdeadbeef));
}
void ncp::
diff -urN ../tmp-orig/plptools-0.14/sisinstall/sisinstaller.cpp
./sisinstall/sisinstaller.cpp
--- ../tmp-orig/plptools-0.14/sisinstall/sisinstaller.cpp 2004-05-31
13:37:09.000000000 +0000
+++ ./sisinstall/sisinstaller.cpp 2005-09-25 08:40:33.000000000 +0000
@@ -453,7 +453,7 @@
SISInstaller::run(SISFile* file, uint8_t* buf, off_t len, SISFile* parent)
{
int n;
- int lang;
+ long lang;
m_file = file;
m_buf = buf;
#if HAVE_LIBNEWT
@@ -515,7 +515,7 @@
newtFormAddComponent(form, text);
newtFormAddComponent(form, listbox);
newtRunForm(form);
- lang = (int)newtListboxGetCurrent(listbox);
+ lang = (long)newtListboxGetCurrent(listbox);
newtFormDestroy(form);
newtPopWindow();
}
@@ -802,7 +802,7 @@
newtFormAddComponent(form, text);
newtFormAddComponent(form, listbox);
newtRunForm(form);
- m_drive = 'A' + (int)newtListboxGetCurrent(listbox);
+ m_drive = 'A' + (long)newtListboxGetCurrent(listbox);
newtFormDestroy(form);
newtPopWindow();
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
