.gitignore | 4 ++++ A8Eq.c | 3 +-- Alloc.c | 19 ++++++++++++++++--- CA8.c | 3 +-- DA32.c | 3 +-- DA8.c | 3 +-- DAofA8.c | 3 +-- Fill.c | 6 +----- Flush.c | 6 +----- Makefile.am | 6 +++--- RA16.c | 4 +--- RA32.c | 4 +--- RA8.c | 4 +--- RAofA8.c | 4 +--- RC16.c | 4 +--- RC32.c | 4 +--- RC8.c | 4 +--- README | 25 +++++++++++++++++++++++++ RHead.c | 4 +--- RR.c | 3 +-- WA16.c | 4 +--- WA32.c | 4 +--- WA8.c | 4 +--- WAofA8.c | 4 +--- configure.ac | 12 ++++++------ 25 files changed, 74 insertions(+), 70 deletions(-)
New commits: commit 3a7e0bb1cec5975e9fcbddc6569e7ac1aea550e5 Author: Peter Hutterer <[email protected]> Date: Fri Aug 28 15:32:31 2009 +1000 libXdmcp 1.0.3 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index d259f62..9164231 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libXdmcp, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp) +AC_INIT(libXdmcp, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 8ba417e3f3915102f99e08b15e1543680120102d Author: Peter Hutterer <[email protected]> Date: Wed Sep 23 21:59:12 2009 +1000 Require macros 1.3 for XORG_DEFAULT_OPTIONS. Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 4d8f502..d259f62 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,8 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) # Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2.1) +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AC_PROG_CC AC_PROG_INSTALL @@ -46,7 +46,7 @@ AC_CHECK_FUNCS([srand48 lrand48]) AC_SEARCH_LIBS([recvfrom],[socket]) PKG_CHECK_MODULES(XDMCP, xproto) -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS" AC_SUBST(XDMCP_CFLAGS) AC_SUBST(XDMCP_LIBS) @@ -64,8 +64,5 @@ dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xdmcp]) -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile xdmcp.pc]) commit d992d9dd3af95132ca76f0479d08d3479b899a95 Author: Alan Coopersmith <[email protected]> Date: Mon Feb 2 20:34:33 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/README b/README index e69de29..7ba85f0 100644 --- a/README +++ b/README @@ -0,0 +1,25 @@ +libXdmcp - X Display Manager Control Protocol library + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/lib/libXdmcp + + http://cgit.freedesktop.org/xorg/lib/libXdmcp + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + commit 49336f1b6fa5d8dc8a9ae3e8d286b061f0d2914c Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Fri Jan 9 16:34:13 2009 -0200 Ansification and compile warning fixes. Code that already have a header with the proper prototype is safe to ansify. This uses XORG_CHANGELOG macro to properly work with the "git-log" to "git log" change (required to pass "make distcheck"), uses the XORG_CWARNFLAGS macro, and doesn't generate any compile warnings from gcc 4.3 and sparse. diff --git a/.gitignore b/.gitignore index fcf7a61..d7302be 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ mkinstalldirs stamp-h1 xdmcp.pc *~ +ChangeLog +*.o +libXdmcp-*.tar.* +*.patch diff --git a/A8Eq.c b/A8Eq.c index b986580..d274f78 100644 --- a/A8Eq.c +++ b/A8Eq.c @@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpARRAY8Equal (array1, array2) - ARRAY8Ptr array1, array2; +XdmcpARRAY8Equal (ARRAY8Ptr array1, ARRAY8Ptr array2) { int i; diff --git a/CA8.c b/CA8.c index efdd5a1..dc68c40 100644 --- a/CA8.c +++ b/CA8.c @@ -37,8 +37,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xfuncs.h> int -XdmcpCopyARRAY8 (src, dst) - ARRAY8Ptr src, dst; +XdmcpCopyARRAY8 (ARRAY8Ptr src, ARRAY8Ptr dst) { dst->length = src->length; dst->data = (CARD8 *) Xalloc (dst->length * sizeof (CARD8)); diff --git a/DA32.c b/DA32.c index 9d9620b..37cc99a 100644 --- a/DA32.c +++ b/DA32.c @@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> void -XdmcpDisposeARRAY32 (array) - ARRAY32Ptr array; +XdmcpDisposeARRAY32 (ARRAY32Ptr array) { if (array->data != NULL) Xfree (array->data); array->length = 0; diff --git a/DA8.c b/DA8.c index 9c20690..dbcd635 100644 --- a/DA8.c +++ b/DA8.c @@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> void -XdmcpDisposeARRAY8 (array) - ARRAY8Ptr array; +XdmcpDisposeARRAY8 (ARRAY8Ptr array) { if (array->data != NULL) Xfree (array->data); array->length = 0; diff --git a/DAofA8.c b/DAofA8.c index 73a2e9c..26f0a92 100644 --- a/DAofA8.c +++ b/DAofA8.c @@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> void -XdmcpDisposeARRAYofARRAY8 (array) - ARRAYofARRAY8Ptr array; +XdmcpDisposeARRAYofARRAY8 (ARRAYofARRAY8Ptr array) { int i; diff --git a/Fill.c b/Fill.c index 08f6b35..dd26d8b 100644 --- a/Fill.c +++ b/Fill.c @@ -55,11 +55,7 @@ in this Software without prior written authorization from The Open Group. #endif int -XdmcpFill (fd, buffer, from, fromlen) - int fd; - XdmcpBufferPtr buffer; - XdmcpNetaddr from; /* return */ - int *fromlen; /* return */ +XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen) { BYTE *newBuf; #ifdef STREAMSCONN diff --git a/Flush.c b/Flush.c index d04cdb3..6a32e7c 100644 --- a/Flush.c +++ b/Flush.c @@ -55,11 +55,7 @@ in this Software without prior written authorization from The Open Group. #endif int -XdmcpFlush (fd, buffer, to, tolen) - int fd; - XdmcpBufferPtr buffer; - XdmcpNetaddr to; - int tolen; +XdmcpFlush (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr to, int tolen) { int result; #ifdef STREAMSCONN diff --git a/Makefile.am b/Makefile.am index 14e8ed0..e419649 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,13 +80,13 @@ $(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) $(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) endif MAKE_LINT_LIB -if MAINTAINER_MODE +MAINTAINERCLEANFILES=ChangeLog + .PHONY: ChangeLog ChangeLog: - GIT_DIR=${srcdir}/.git git-log > ChangeLog + $(CHANGELOG_CMD) dist-hook: ChangeLog -endif MAINTAINER_MODE CLEANFILES=$(lintlib_DATA) diff --git a/RA16.c b/RA16.c index 0a279a4..c8ccd1a 100644 --- a/RA16.c +++ b/RA16.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadARRAY16 (buffer, array) - XdmcpBufferPtr buffer; - ARRAY16Ptr array; +XdmcpReadARRAY16 (XdmcpBufferPtr buffer, ARRAY16Ptr array) { int i; diff --git a/RA32.c b/RA32.c index 9baa285..8f6bfd3 100644 --- a/RA32.c +++ b/RA32.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadARRAY32 (buffer, array) - XdmcpBufferPtr buffer; - ARRAY32Ptr array; +XdmcpReadARRAY32 (XdmcpBufferPtr buffer, ARRAY32Ptr array) { int i; diff --git a/RA8.c b/RA8.c index 2b8b962..b447896 100644 --- a/RA8.c +++ b/RA8.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadARRAY8 (buffer, array) - XdmcpBufferPtr buffer; - ARRAY8Ptr array; +XdmcpReadARRAY8 (XdmcpBufferPtr buffer, ARRAY8Ptr array) { int i; diff --git a/RAofA8.c b/RAofA8.c index d751e99..7c8563f 100644 --- a/RAofA8.c +++ b/RAofA8.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadARRAYofARRAY8 (buffer, array) - XdmcpBufferPtr buffer; - ARRAYofARRAY8Ptr array; +XdmcpReadARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array) { int i; diff --git a/RC16.c b/RC16.c index 1af69a6..cd5ec4d 100644 --- a/RC16.c +++ b/RC16.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadCARD16 (buffer, valuep) - XdmcpBufferPtr buffer; - CARD16Ptr valuep; +XdmcpReadCARD16 (XdmcpBufferPtr buffer, CARD16Ptr valuep) { CARD8 high, low; diff --git a/RC32.c b/RC32.c index caf19e6..99a6d35 100644 --- a/RC32.c +++ b/RC32.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadCARD32 (buffer, valuep) - XdmcpBufferPtr buffer; - CARD32Ptr valuep; +XdmcpReadCARD32 (XdmcpBufferPtr buffer, CARD32Ptr valuep) { CARD8 byte0, byte1, byte2, byte3; if (XdmcpReadCARD8 (buffer, &byte0) && diff --git a/RC8.c b/RC8.c index a9cd068..4376265 100644 --- a/RC8.c +++ b/RC8.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadCARD8 (buffer, valuep) - XdmcpBufferPtr buffer; - CARD8Ptr valuep; +XdmcpReadCARD8 (XdmcpBufferPtr buffer, CARD8Ptr valuep) { if (buffer->pointer >= buffer->count) return FALSE; diff --git a/RHead.c b/RHead.c index 6b0b837..a5640a5 100644 --- a/RHead.c +++ b/RHead.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadHeader (buffer, header) - XdmcpBufferPtr buffer; - XdmcpHeaderPtr header; +XdmcpReadHeader (XdmcpBufferPtr buffer, XdmcpHeaderPtr header) { if (XdmcpReadCARD16 (buffer, &header->version) && XdmcpReadCARD16 (buffer, &header->opcode) && diff --git a/RR.c b/RR.c index 2d7d2db..3f0c26a 100644 --- a/RR.c +++ b/RR.c @@ -36,8 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpReadRemaining (buffer) - XdmcpBufferPtr buffer; +XdmcpReadRemaining (XdmcpBufferPtr buffer) { return buffer->count - buffer->pointer; } diff --git a/WA16.c b/WA16.c index 4551161..8ad307b 100644 --- a/WA16.c +++ b/WA16.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpWriteARRAY16 (buffer, array) - XdmcpBufferPtr buffer; - ARRAY16Ptr array; +XdmcpWriteARRAY16 (XdmcpBufferPtr buffer, ARRAY16Ptr array) { int i; diff --git a/WA32.c b/WA32.c index 8d61b1e..b58ad25 100644 --- a/WA32.c +++ b/WA32.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpWriteARRAY32 (buffer, array) - XdmcpBufferPtr buffer; - ARRAY32Ptr array; +XdmcpWriteARRAY32 (XdmcpBufferPtr buffer, ARRAY32Ptr array) { int i; diff --git a/WA8.c b/WA8.c index 43443c9..336d747 100644 --- a/WA8.c +++ b/WA8.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpWriteARRAY8 (buffer, array) - XdmcpBufferPtr buffer; - ARRAY8Ptr array; +XdmcpWriteARRAY8 (XdmcpBufferPtr buffer, ARRAY8Ptr array) { int i; diff --git a/WAofA8.c b/WAofA8.c index 69f7bd0..d50f3a6 100644 --- a/WAofA8.c +++ b/WAofA8.c @@ -36,9 +36,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> int -XdmcpWriteARRAYofARRAY8 (buffer, array) - XdmcpBufferPtr buffer; - ARRAYofARRAY8Ptr array; +XdmcpWriteARRAYofARRAY8 (XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array) { int i; diff --git a/configure.ac b/configure.ac index 88d8754..4d8f502 100644 --- a/configure.ac +++ b/configure.ac @@ -30,9 +30,9 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2.1) AC_PROG_CC AC_PROG_INSTALL @@ -46,6 +46,8 @@ AC_CHECK_FUNCS([srand48 lrand48]) AC_SEARCH_LIBS([recvfrom],[socket]) PKG_CHECK_MODULES(XDMCP, xproto) +XORG_CWARNFLAGS +XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS" AC_SUBST(XDMCP_CFLAGS) AC_SUBST(XDMCP_LIBS) @@ -63,6 +65,7 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([Xdmcp]) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile xdmcp.pc]) commit 498cce64f12de67271316417de821460e8eee066 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Wed Nov 26 23:45:09 2008 -0200 Mark Xalloc, Xrealloc, and Xfree as weak symbols. Maybe a _X_WEAK macro could be added to <X11/Xfuncproto.h>, but that could actually encourage use of __attribute__((weak)), what is not intended. This change uses the same semantics used in libXfont to declare weak symbols that are overridden by the ones defined in the X Server. diff --git a/Alloc.c b/Alloc.c index 40cbacf..1c32270 100644 --- a/Alloc.c +++ b/Alloc.c @@ -40,7 +40,20 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xdmcp.h> #include <stdlib.h> -void * +/* this probably works for Mach-O too, but probably not for PE */ +#if defined(__ELF__) && defined(__GNUC__) && (__GNUC__ >= 3) +#define weak __attribute__((weak)) +#else +#define weak +#endif + +#ifdef __SUNPRO_C +#pragma weak Xalloc +#pragma weak Xrealloc +#pragma weak Xfree +#endif + +weak void * Xalloc (unsigned long amount) { if (amount == 0) @@ -48,7 +61,7 @@ Xalloc (unsigned long amount) return malloc (amount); } -void * +weak void * Xrealloc (void *old, unsigned long amount) { if (amount == 0) @@ -58,7 +71,7 @@ Xrealloc (void *old, unsigned long amount) return realloc ((char *) old, amount); } -void +weak void Xfree (void *old) { if (old) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
