From: Laszlo Ladanyi (ladanyi_at_watson.ibm.com)
Date: Fri Mar 26 1999 - 20:46:28 GMT
Hello,
I have grabbed the 3.34beta prerelease, and had to make the changes below to
get it compile on potato, the Debian unstable version of Linux. The compiled
ups works just great.
I believe that all of these changes are related to the fact that potato uses
glibc v2.1 instead of glibc v2.0. On the other hand I couldn't find any
defines that would identify the C library version, so I couldn't enclose the
changes in #ifdef's. It's very likely that after applying these diffs the code
will compile only on systems with glibc2.1.
BTW, I compiled ups with egcs 1.1.2 instead of potato's egcs 1.1.2-pre3 (which
has a libstdc++ that's NOT compatible with that of 1.1.2 -- but that's
off-topic).
--Laci
PS: Does anyone know how to get easily the result of running a member function
in C++? I mean the following situation:
I have a vector, and (along with the data members) I'd like to see the
size of the vector in the data section of the display, that is to have
x.size() out there. Is there any way to do this?
--Laci
------------------------- cut here ------------------------
diff -c -r ups-3.34beta/lib/libx11wn/wn_event.c ups-3.34beta.orig/lib/libx11wn/wn_event.c
*** ups-3.34beta/lib/libx11wn/wn_event.c Fri Mar 26 10:38:40 1999
--- ups-3.34beta.orig/lib/libx11wn/wn_event.c Thu Apr 30 14:10:46 1998
***************
*** 201,207 ****
struct timeval tvbuf, *stm;
FD_ZERO(&mask);
! mask.__fds_bits[0] = win_mask | User_fd_mask;
#ifdef SUNVIEW
if (Wakeup_fd != -1)
FD_SET(Wakeup_fd, &mask);
--- 201,207 ----
struct timeval tvbuf, *stm;
FD_ZERO(&mask);
! mask.fds_bits[0] = win_mask | User_fd_mask;
#ifdef SUNVIEW
if (Wakeup_fd != -1)
FD_SET(Wakeup_fd, &mask);
***************
*** 238,249 ****
return EV_OTHER;
}
#endif
! if (mask.__fds_bits[0] & win_mask) {
! *p_resmask = mask.__fds_bits[0] & win_mask;
return EV_OTHER;
}
! if (mask.__fds_bits[0] & User_fd_mask) {
! *p_resmask = mask.__fds_bits[0] & User_fd_mask;
return EV_OTHER_INPUT;
}
}
--- 238,249 ----
return EV_OTHER;
}
#endif
! if (mask.fds_bits[0] & win_mask) {
! *p_resmask = mask.fds_bits[0] & win_mask;
return EV_OTHER;
}
! if (mask.fds_bits[0] & User_fd_mask) {
! *p_resmask = mask.fds_bits[0] & User_fd_mask;
return EV_OTHER_INPUT;
}
}
diff -c -r ups-3.34beta/ups/ao_elfcore.c ups-3.34beta.orig/ups/ao_elfcore.c
*** ups-3.34beta/ups/ao_elfcore.c Fri Mar 26 11:42:15 1999
--- ups-3.34beta.orig/ups/ao_elfcore.c Thu Mar 11 21:02:35 1999
***************
*** 66,72 ****
#ifdef _STRUCTURED_PROC
static void
! get_psinfo_info(alloc_pool_t *ap, prpsinfo_t *ps,
char **p_cmdname, const char **p_cmdline)
{
char *cmdline, *args;
--- 66,72 ----
#ifdef _STRUCTURED_PROC
static void
! get_psinfo_info(alloc_pool_t *ap, psinfo_t *ps,
char **p_cmdname, const char **p_cmdline)
{
char *cmdline, *args;
***************
*** 94,100 ****
#else
static void
! get_prpsinfo_info(alloc_pool_t *ap, prprpsinfo_t *ps,
char **p_cmdname, const char **p_cmdline)
{
char *cmdline, *args;
--- 94,100 ----
#else
static void
! get_prpsinfo_info(alloc_pool_t *ap, prpsinfo_t *ps,
char **p_cmdname, const char **p_cmdline)
{
char *cmdline, *args;
***************
*** 199,209 ****
#ifdef _STRUCTURED_PROC
case NT_PSINFO:
! get_psinfo_info(ap, (prpsinfo_t *)desc, &cmdname, &cmdline);
break;
#else
case NT_PRPSINFO:
! get_prpsinfo_info(ap, (prprpsinfo_t *)desc, &cmdname, &cmdline);
break;
#endif /* not _STRUCTURED_PROC */
case NT_PRXREG:
--- 199,209 ----
#ifdef _STRUCTURED_PROC
case NT_PSINFO:
! get_psinfo_info(ap, (psinfo_t *)desc, &cmdname, &cmdline);
break;
#else
case NT_PRPSINFO:
! get_prpsinfo_info(ap, (prpsinfo_t *)desc, &cmdname, &cmdline);
break;
#endif /* not _STRUCTURED_PROC */
case NT_PRXREG:
diff -c -r ups-3.34beta/ups/cx_libvars.h ups-3.34beta.orig/ups/cx_libvars.h
*** ups-3.34beta/ups/cx_libvars.h Fri Mar 26 11:34:01 1999
--- ups-3.34beta.orig/ups/cx_libvars.h Fri Jan 8 21:11:53 1999
***************
*** 74,82 ****
#endif
/* Linux implementation of standard I/O. */
#if defined(_IO_stdin)
! V(_IO_2_1_stdin_)
! V(_IO_2_1_stdout_)
! V(_IO_2_1_stderr_)
#endif
#ifdef OS_ULTRIX
V(_pctype)
--- 74,82 ----
#endif
/* Linux implementation of standard I/O. */
#if defined(_IO_stdin)
! V(_IO_stdin_)
! V(_IO_stdout_)
! V(_IO_stderr_)
#endif
#ifdef OS_ULTRIX
V(_pctype)
diff -c -r ups-3.34beta/ups/xc_machine.c ups-3.34beta.orig/ups/xc_machine.c
*** ups-3.34beta/ups/xc_machine.c Fri Mar 26 10:53:49 1999
--- ups-3.34beta.orig/ups/xc_machine.c Mon Jan 25 12:58:47 1999
***************
*** 45,53 ****
#if defined(OS_SVR4)
#define _longjmp longjmp
! #if !(defined(__USE_BSD) || defined(__USE_XOPEN))
! # define _setjmp setjmp
! #endif
#endif
static void spfailed PROTO((long expected, long got, long location));
--- 45,51 ----
#if defined(OS_SVR4)
#define _longjmp longjmp
! #define _setjmp setjmp
#endif
static void spfailed PROTO((long expected, long got, long location));
This archive was generated by hypermail 2.1.4 : Wed Feb 13 2002 - 21:51:32 GMT