Attachment 1766 Details for Bug 2386 – [FIXED_X11R68x] Proposed fix for X11R6.8.x stable branch

[patch] [FIXED_X11R68x] Proposed fix for X11R6.8.x stable branch

patch.gudiff (text/plain), 3.55 KB, created by Roland Mainz on 2005-01-27 16:58:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2005-01-27 16:58:50 UTC

Size: 3.55 KB

patch

obsolete

>Index: xc/programs/xrx/plugin/include/npapi.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xrx/plugin/include/npapi.h,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 npapi.h
>--- xc/programs/xrx/plugin/include/npapi.h	23 Apr 2004 19:55:03 -0000	1.2
>+++ xc/programs/xrx/plugin/include/npapi.h	28 Jan 2005 00:55:43 -0000
>@@ -23,46 +23,49 @@
> 
> /*----------------------------------------------------------------------*/
> /*                   Plugin Version Constants                           */
> /*----------------------------------------------------------------------*/
> 
> #define NP_VERSION_MAJOR 0
> #define NP_VERSION_MINOR 9
> 
> 
> 
> /*----------------------------------------------------------------------*/
> /*                   Definition of Basic Types                          */
> /*----------------------------------------------------------------------*/
>  
> #ifndef _UINT16
> typedef unsigned short uint16;
> #endif
> #ifndef _UINT32
> typedef unsigned int uint32;
> #endif
>+
>+#if !(defined(_AIX) && defined(_H_INTTYPES) && defined(_ALL_SOURCE))
> #ifndef _INT16
> typedef short int16;
> #endif
> #ifndef _INT32
> typedef int int32;
> #endif
>+#endif
> 
> #ifndef FALSE
> #define FALSE (0)
> #endif
> #ifndef TRUE
> #define TRUE (1)
> #endif
> #include <stddef.h>
> 
> typedef unsigned char	NPBool;
> typedef void*			NPEvent;
> typedef int16			NPError;
> typedef int16			NPReason;
> typedef char*			NPMIMEType;
> 
> 
> 
> /*----------------------------------------------------------------------*/
> /*                   Structures and definitions                         */
> /*----------------------------------------------------------------------*/
>Index: xc/programs/xrx/xnest-plugin/XnestDis.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xrx/xnest-plugin/XnestDis.c,v
>retrieving revision 1.2.4.1
>diff -u -2 -0 -r1.2.4.1 XnestDis.c
>--- xc/programs/xrx/xnest-plugin/XnestDis.c	24 Jan 2005 05:01:54 -0000	1.2.4.1
>+++ xc/programs/xrx/xnest-plugin/XnestDis.c	28 Jan 2005 00:55:49 -0000
>@@ -12,40 +12,41 @@
> 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 MERCHANTABIL-
> ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
> SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL-
> ITY, 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.
> 
> */
> /* $XFree86$ */
> 
> #include "RxPlugin.h"
>+#include <sys/stat.h>
> 
> /***********************************************************************
>  * Utility functions and global variable to manage display numbers
>  ***********************************************************************/
> 
> /* maximum numbers of concurrent instances (per machine) */
> #define MAX_PLUGINS 128
> 
> /* start from 80 to avoid possible conflict with multi-display X server
>  * like SunRay,LTSP, etc.*/
> #define XNEST_OFFSET 80
> 
> /* global allowing to know which display numbers are in use */
> static char xnest_display_numbers[MAX_PLUGINS];
> 
> void
> RxpInitXnestDisplayNumbers()
> {
>     memset(xnest_display_numbers, 0, sizeof(char) * MAX_PLUGINS);
> }

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 2386: 1766

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.