aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/Xdmcp/Alloc.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-22 22:48:54 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-22 22:48:54 +0200
commit825af1835c81070931d078b153e2d49df4a6bc69 (patch)
tree8f4d31115a2a3e6159f7fba88a84e6d0997291e6 /nx-X11/lib/Xdmcp/Alloc.c
parenta5bb888248b3887bbe306505f900368b931b7f18 (diff)
parent49fc383a4107062a843bc0c3a8fd9cae7e20e032 (diff)
downloadnx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.gz
nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.bz2
nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.zip
Merge branch 'sunweaver-pr/libxdmcp-cleanup' into arctica-3.6.x
Attributes GH PR #15: https://github.com/ArcticaProject/nx-libs/pull/15
Diffstat (limited to 'nx-X11/lib/Xdmcp/Alloc.c')
-rw-r--r--nx-X11/lib/Xdmcp/Alloc.c66
1 files changed, 0 insertions, 66 deletions
diff --git a/nx-X11/lib/Xdmcp/Alloc.c b/nx-X11/lib/Xdmcp/Alloc.c
deleted file mode 100644
index 40cbacf0b..000000000
--- a/nx-X11/lib/Xdmcp/Alloc.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * $Xorg: Alloc.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $
- *
- *
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- * Author: Keith Packard, MIT X Consortium
- */
-
-/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */
-
-/* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xdmcp.h>
-#include <stdlib.h>
-
-void *
-Xalloc (unsigned long amount)
-{
- if (amount == 0)
- amount = 1;
- return malloc (amount);
-}
-
-void *
-Xrealloc (void *old, unsigned long amount)
-{
- if (amount == 0)
- amount = 1;
- if (!old)
- return malloc (amount);
- return realloc ((char *) old, amount);
-}
-
-void
-Xfree (void *old)
-{
- if (old)
- free ((char *) old);
-}