Attachment 14593 Details for Bug 14691 – 0003-Add-missing-prototypes.patch

[patch] 0003-Add-missing-prototypes.patch

0003-Add-missing-prototypes.patch (text/plain), 3.03 KB, created by Paulo César Pereira de Andrade on 2008-02-26 12:27:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-02-26 12:27:13 UTC

Size: 3.03 KB

patch

obsolete

>From 066edd882bc6f0cbd61df063d737122173b9985a Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Tue, 26 Feb 2008 16:53:49 -0300
>Subject: [PATCH] Add missing prototypes.
>
>There are still prototypes for internal libICE functions in
>sm_client.c and sm_manager.c.
>---
> src/globals.h    |   18 ++++++++++++++++++
> src/sm_client.c  |   10 ----------
> src/sm_error.c   |    2 +-
> src/sm_manager.c |    9 +--------
> src/sm_process.c |    2 +-
> 5 files changed, 21 insertions(+), 20 deletions(-)
>
>diff --git a/src/globals.h b/src/globals.h
>index 8dc0d5f..ff71709 100644
>--- a/src/globals.h
>+++ b/src/globals.h
>@@ -54,4 +54,22 @@ extern void _SmsDefaultErrorHandler (
>     SmPointer		/* values */
> );
> 
>+extern void _SmcProcessMessage (
>+    IceConn		/* iceConn */,
>+    IcePointer		/* clientData */,
>+    int 		/* opcode */,
>+    unsigned long	/* length */,
>+    Bool		/* swap */,
>+    IceReplyWaitInfo *	/* replyWait */,
>+    Bool *		/* replyReadyRet */
>+);
>+
>+extern void _SmsProcessMessage (
>+    IceConn		/* iceConn */,
>+    IcePointer		/* clientData */,
>+    int 		/* opcode */,
>+    unsigned long	/* length */,
>+    Bool		/* swap */
>+);
>+
> #endif /* _ICEGLOBALS_H_ */
>diff --git a/src/sm_client.c b/src/sm_client.c
>index 8dbc4a0..73fab4b 100644
>--- a/src/sm_client.c
>+++ b/src/sm_client.c
>@@ -50,16 +50,6 @@ extern IcePoAuthStatus _IcePoMagicCookie1Proc (
>     char **		/* errorStringRet */
> );
> 
>-extern void _SmcProcessMessage (
>-    IceConn		/* iceConn */,
>-    IcePointer		/* clientData */,
>-    int 		/* opcode */,
>-    unsigned long	/* length */,
>-    Bool		/* swap */,
>-    IceReplyWaitInfo *	/* replyWait */,
>-    Bool *		/* replyReadyRet */
>-);
>-
> static void set_callbacks (
>     SmcConn		smcConn,
>     unsigned long	mask,
>diff --git a/src/sm_error.c b/src/sm_error.c
>index 17b85bc..71dafa9 100644
>--- a/src/sm_error.c
>+++ b/src/sm_error.c
>@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
> #include <X11/SM/SMlib.h>
> #include "SMlibint.h"
> #include <stdio.h>
>-
>+#include "globals.h"
> 
> 
> /*
>diff --git a/src/sm_manager.c b/src/sm_manager.c
>index 1b30bc0..279e551 100644
>--- a/src/sm_manager.c
>+++ b/src/sm_manager.c
>@@ -37,6 +37,7 @@ in this Software without prior written authorization from The Open Group.
> #include <X11/SM/SMlib.h>
> #include "SMlibint.h"
> #include <X11/Xtrans/Xtrans.h>
>+#include "globals.h"
> 
> #ifdef __UNIXWARE__
> #undef shutdown
>@@ -53,14 +54,6 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc (
>     char **		/* errorStringRet */
> );
> 
>-extern void _SmsProcessMessage (
>-    IceConn		/* iceConn */,
>-    IcePointer		/* clientData */,
>-    int 		/* opcode */,
>-    unsigned long	/* length */,
>-    Bool		/* swap */
>-);
>-
> 
> 
> static Status
>diff --git a/src/sm_process.c b/src/sm_process.c
>index eb1605f..a415180 100644
>--- a/src/sm_process.c
>+++ b/src/sm_process.c
>@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include <X11/SM/SMlib.h>
> #include "SMlibint.h"
>-
>+#include "globals.h"
> 
> /*
>  * Check for bad length
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 14691: 14591 | 14592 | 14593 | 14594 | 15102

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.