Attachment 1492 Details for Bug 830 – [FIXED_X11R68x] Final patch for X11/extensions/dpms.h (patch for 2004-12-06-trunk)

[patch] [FIXED_X11R68x] Final patch for X11/extensions/dpms.h (patch for 2004-12-06-trunk)

patch.gudiff (text/plain), 3.75 KB, created by Roland Mainz on 2004-12-07 15:34:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-12-07 15:34:33 UTC

Size: 3.75 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.580
>diff -u -2 -0 -r1.580 ChangeLog
>--- xc/ChangeLog	6 Dec 2004 21:54:19 -0000	1.580
>+++ xc/ChangeLog	7 Dec 2004 23:29:46 -0000
>@@ -1,20 +1,28 @@
>+2004-12-07 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/include/extensions/dpms.h
>+	Bugzilla #830 (https://bugs.freedesktop.org/show_bug.cgi?id=830):
>+	Get DPMS header file (include/extensions/dpms.h) working with C++
>+	applications.
>+	Patch by Kevin DeKorte <kdekorte@yahoo.com> and Roland
>+	Mainz <roland.mainz@nrubsig.org>.
>+
> 2004-12-06  Matthieu Herrb <matthieu.herrb@laas.fr>
> 
> 	* programs/Xserver/hw/xfree86/common/Imakefile:
> 	xf86Config.c references USE_DEPRECATED_KEYBOARD_DRIVER so
> 	define it if needed when building this file
> 	* programs/Xserver/hw/xfree86/common/xf86config.c:
> 	- bug fix: pointerMsg -> keyboardMsg in auto-configuration code.
> 	- make the 'kbd' driver the default for autoconfiguration everywhere.
> 	* programs/Xserver/hw/xfree86/input/keyboard/kbd.c:
> 	Previous fix broke hardware-based autorepeat. This fix
> 	mimics the behaviour of the legacy driver by making a local
> 	copy of the autoRepeat flag. 
> 
> 2004-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
> 
> 	* lib/dmx/dmx.c: (DMXAddScreen), (DMXAddInput):
> 	Fix overwrite in DMX library calls (Bug #1989, Mark McLoughlin).
> 
> 2004-12-06  Alexander Gottwald  <ago at freedesktop dot org>
> 
>Index: xc/include/extensions/dpms.h
>===================================================================
>RCS file: /cvs/xorg/xc/include/extensions/dpms.h,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 dpms.h
>--- xc/include/extensions/dpms.h	23 Apr 2004 18:43:06 -0000	1.2
>+++ xc/include/extensions/dpms.h	7 Dec 2004 23:30:00 -0000
>@@ -11,50 +11,57 @@
> 
> 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
> DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, 
> BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation 
> shall not be used in advertising or otherwise to promote the sale, use or other
> dealings in this Software without prior written authorization from Digital 
> Equipment Corporation.
> 
> ******************************************************************/
> /* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */
> 
>+#ifndef _X11_EXTENSIONS_DPMS_H
>+#define _X11_EXTENSIONS_DPMS_H 1
>+
> /*
>  * HISTORY
>  */
> /*
>  * @(#)RCSfile: dpms.h,v Revision: 1.1.4.2  (DEC) Date: 1995/11/21 19:34:17
>  */
> 
> 
> #define DPMSModeOn	0
> #define DPMSModeStandby	1
> #define DPMSModeSuspend	2
> #define DPMSModeOff	3
> 
> #ifndef DPMS_SERVER
> 
> #include <X11/X.h>
> #include <X11/Xmd.h>
> 
>+_XFUNCPROTOBEGIN
>+
> extern Bool DPMSQueryExtension(Display *, int *, int *);
> extern Status DPMSGetVersion(Display *, int *, int *);
> extern Bool DPMSCapable(Display *);
> extern Status DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16);
> extern Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *);
> extern Status DPMSEnable(Display *);
> extern Status DPMSDisable(Display *);
> extern Status DPMSForceLevel(Display *, CARD16);
> extern Status DPMSInfo(Display *, CARD16 *, BOOL *);
>-#endif
> 
>+_XFUNCPROTOEND
>+#endif /* !DPMS_SERVER */
>+#endif /* !_X11_EXTENSIONS_DPMS_H */
>

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 830: 811 | 815 | 816 | 817 | 1492 | 1493

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.