Mercurial > hg > xemacs-beta
annotate src/fontcolor-x-impl.h @ 5887:6eca500211f4
Prototype for X509_check_host() has changed, detect this in configure.ac
ChangeLog addition:
2015-04-09 Aidan Kehoe <kehoea@parhasard.net>
* configure.ac:
If X509_check_host() is available, check the number of arguments
it takes. Don't use it if it takes any number of arguments other
than five. Also don't use it if <openssl/x509v3.h> does not
declare it, since if that is so there is no portable way to tell
how many arguments it should take, and so we would end up smashing
the stack.
* configure: Regenerate.
src/ChangeLog addition:
2015-04-09 Aidan Kehoe <kehoea@parhasard.net>
* tls.c:
#include <openssl/x509v3.h> for its prototype for
X509_check_host().
* tls.c (tls_open):
Pass the new fifth argument to X509_check_host().
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 09 Apr 2015 14:27:02 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 872 | 1 /* X-specific Lisp objects. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995, 1996, 2002 Ben Wing. | |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
| 872 | 9 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
10 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
11 option) any later version. |
| 872 | 12 |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 872 | 20 |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-10-00. */ | |
| 24 | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
25 #ifndef INCLUDED_fontcolor_x_impl_h_ |
|
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
26 #define INCLUDED_fontcolor_x_impl_h_ |
| 872 | 27 |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
28 #include "fontcolor-impl.h" |
|
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
29 #include "fontcolor-x.h" |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4909
diff
changeset
|
30 #ifdef HAVE_XFT |
| 3094 | 31 /* for resource name definitions, etc */ |
| 32 #include "../lwlib/lwlib-fonts.h" | |
| 33 #endif | |
| 872 | 34 |
| 35 #ifdef HAVE_X_WINDOWS | |
| 36 | |
| 37 /***************************************************************************** | |
| 38 Color-Instance | |
| 39 ****************************************************************************/ | |
| 40 | |
| 41 struct x_color_instance_data | |
| 42 { | |
| 43 XColor color; | |
| 3094 | 44 /* Yes, it looks crazy to have both the XColor and the XftColor, but |
| 45 pragmatically both are used. */ | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4909
diff
changeset
|
46 #ifdef HAVE_XFT |
| 3094 | 47 XftColor xftColor; |
| 48 #endif | |
| 872 | 49 char dealloc_on_gc; |
| 50 }; | |
| 51 | |
| 52 #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data) | |
| 53 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color) | |
| 4909 | 54 #define XCOLOR_INSTANCE_X_COLOR(c) COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (c)) |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4909
diff
changeset
|
55 #ifdef HAVE_XFT |
| 3094 | 56 #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor) |
| 57 #endif | |
| 872 | 58 #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc) |
| 59 | |
| 60 /***************************************************************************** | |
| 61 Font-Instance | |
| 62 ****************************************************************************/ | |
| 63 | |
| 64 struct x_font_instance_data | |
| 65 { | |
| 66 /* X-specific information */ | |
| 3094 | 67 /* Yes, it looks crazy to have both the XFontStruct and the XftFont, but |
| 68 pragmatically both are used (lwlib delegates labels to the widget sets, | |
| 69 which internally use XFontStructs). */ | |
| 70 XFontStruct * font; | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4909
diff
changeset
|
71 #ifdef HAVE_XFT |
| 3094 | 72 XftFont *xftFont; |
| 73 #endif | |
| 74 | |
| 872 | 75 }; |
| 76 | |
| 77 #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data) | |
| 78 #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font) | |
| 4909 | 79 #define XFONT_INSTANCE_X_FONT(c) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (c)) |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4909
diff
changeset
|
80 #ifdef HAVE_XFT |
| 3094 | 81 #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont) |
| 82 #endif | |
| 872 | 83 |
| 84 #endif /* HAVE_X_WINDOWS */ | |
| 85 | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
86 #endif /* INCLUDED_fontcolor_x_impl_h_ */ |