aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/GL/include
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2016-10-31 15:06:37 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-12-04 21:31:10 +0100
commitcee997dacb28aa9378b834b66a33c441145dceb7 (patch)
tree1078c9fd4376594c3aae178808f5d99076d2932d /nx-X11/programs/Xserver/GL/include
parentb38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (diff)
downloadnx-libs-cee997dacb28aa9378b834b66a33c441145dceb7.tar.gz
nx-libs-cee997dacb28aa9378b834b66a33c441145dceb7.tar.bz2
nx-libs-cee997dacb28aa9378b834b66a33c441145dceb7.zip
Drop glx_ansic.h wrapper and call malloc, realloc, free and str-funcs directly.
commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37 Author: Kristian Høgsberg <krh@redhat.com> Date: Fri Mar 17 01:47:25 2006 +0000 Check for glproto when building GLX and make sure we have at least 1.4.6. Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs directly. We don't check the glproto version as we know what it is (we have our own proto file). Furthermore, we skip the switch from --glX<func> -> x<func> and directly switch to <func> (e.g. __glXMalloc() -> malloc()). Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/GL/include')
-rw-r--r--nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h110
1 files changed, 0 insertions, 110 deletions
diff --git a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
deleted file mode 100644
index f48ecb8bb..000000000
--- a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _glx_ansic_h_
-#define _glx_ansic_h_
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
-
-/*
-** this needs to check whether we're using XFree86 at all, and then
-** which version we're using. Use these macros if version is 3.9+, else
-** use normal commands below.
-*/
-
-/*
-** turns out this include file only exists for XFree86 3.9+
-** I notice that not having it is not an error and does not stop the build,
-** but having it will allow opengl and glx to be built for 3.9+. We no longer
-** need an explicit define in the Makefile, just point to the correct X source
-** tree and all should be taken care of.
-*/
-
-#ifdef XFree86Server
-
-#ifndef assert
-#define assert(a)
-#endif
-
-#else
-
-#if defined(Lynx) && defined(__assert_h)
-#undef __assert_h
-#endif
-#ifdef assert
-#undef assert
-#endif
-#include <assert.h>
-
-#endif
-
-
-#define GLX_STDOUT stdout
-#define GLX_STDERR stderr
-#define __glXPrintf printf
-#define __glXFprintf fprintf
-#define __glXSprintf sprintf
-#define __glXVfprintf vfprintf
-#define __glXVsprintf vsprintf
-#define __glXFopen fopen
-#define __glXFclose fclose
-#define __glXCos(x) cos(x)
-#define __glXSin(x) sin(x)
-#define __glXAtan(x) atan(x)
-#define __glXAbs(x) abs(x)
-#define __glXLog(x) log(x)
-#define __glXCeil(x) ceil(x)
-#define __glXFloor(x) floor(x)
-#define __glXSqrt(x) sqrt(x)
-#define __glXPow(x, y) pow(x, y)
-#define __glXMemmove(dest, src, n) memmove(dest, src, n)
-#define __glXMemcpy(dest, src, n) memcpy(dest, src, n)
-#define __glXMemset(s, c, n) memset(s, c, n)
-#define __glXStrdup(str) xstrdup(str)
-#define __glXStrcpy(dest, src) strcpy(dest, src)
-#define __glXStrncpy(dest, src, n) strncpy(dest, src, n)
-#define __glXStrcat(dest, src) strcat(dest, src)
-#define __glXStrncat(dest, src, n) strncat(dest, src, n)
-#define __glXStrcmp(s1, s2) strcmp(s1, s2)
-#define __glXStrncmp(s1, s2, n) strncmp(s1, s2, n)
-#define __glXStrlen(str) strlen(str)
-#define __glXAbort() abort()
-#define __glXStrtok(s, delim) strtok(s, delim)
-#define __glXStrcspn(s, reject) strcspn(s, reject)
-#define __glXGetenv(a) getenv(a)
-#define __glXAtoi(a) atoi(a)
-
-#endif /* _glx_ansic_h_ */