Mercurial > hg > xemacs-beta

comparison src/font-mgr.h @ 5133:444a448b2f53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch ben-lisp-object into default branch
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 06:47:37 -0600
parents a9c41067dd88
children 308d34e9f07d
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
52 52
53 #define XE_XLFD_MAKE_LISP_STRING(s) (make_string(s, strlen(s))) 53 #define XE_XLFD_MAKE_LISP_STRING(s) (make_string(s, strlen(s)))
54 54
55 struct fc_pattern 55 struct fc_pattern
56 { 56 {
57 struct LCRECORD_HEADER header; 57 NORMAL_LISP_OBJECT_HEADER header;
58 FcPattern *fcpatPtr; 58 FcPattern *fcpatPtr;
59 }; 59 };
60 60
61 typedef struct fc_pattern fc_pattern; 61 typedef struct fc_pattern fc_pattern;
62 62
63 DECLARE_LRECORD(fc_pattern, struct fc_pattern); 63 DECLARE_LISP_OBJECT(fc_pattern, struct fc_pattern);
64 #define XFCPATTERN(x) XRECORD (x, fc_pattern, struct fc_pattern) 64 #define XFC_PATTERN(x) XRECORD (x, fc_pattern, struct fc_pattern)
65 #define wrap_fcpattern(p) wrap_record (p, fc_pattern) 65 #define wrap_fc_pattern(p) wrap_record (p, fc_pattern)
66 #define FCPATTERNP(x) RECORDP (x, fc_pattern) 66 #define FC_PATTERNP(x) RECORDP (x, fc_pattern)
67 #define CHECK_FCPATTERN(x) CHECK_RECORD (x, fc_pattern) 67 #define CHECK_FC_PATTERN(x) CHECK_RECORD (x, fc_pattern)
68 #define CONCHECK_FCPATTERN(x) CONCHECK_RECORD (x, fc_pattern) 68 #define CONCHECK_FC_PATTERN(x) CONCHECK_RECORD (x, fc_pattern)
69 #define XFCPATTERN_PTR(x) (XFCPATTERN(x)->fcpatPtr) 69 #define XFC_PATTERN_PTR(x) (XFC_PATTERN(x)->fcpatPtr)
70 70
71 #define FONTCONFIG_EXPOSE_CONFIG 71 #define FONTCONFIG_EXPOSE_CONFIG
72 #ifdef FONTCONFIG_EXPOSE_CONFIG 72 #ifdef FONTCONFIG_EXPOSE_CONFIG
73 73
74 struct fc_config 74 struct fc_config
75 { 75 {
76 struct LCRECORD_HEADER header; 76 NORMAL_LISP_OBJECT_HEADER header;
77 FcConfig *fccfgPtr; 77 FcConfig *fccfgPtr;
78 }; 78 };
79 79
80 typedef struct fc_config fc_config; 80 typedef struct fc_config fc_config;
81 81
82 DECLARE_LRECORD(fc_config, struct fc_config); 82 DECLARE_LISP_OBJECT(fc_config, struct fc_config);
83 #define XFCCONFIG(x) XRECORD (x, fc_config, struct fc_config) 83 #define XFC_CONFIG(x) XRECORD (x, fc_config, struct fc_config)
84 #define wrap_fcconfig(p) wrap_record (p, fc_config) 84 #define wrap_fc_config(p) wrap_record (p, fc_config)
85 #define FCCONFIGP(x) RECORDP (x, fc_config) 85 #define FC_CONFIGP(x) RECORDP (x, fc_config)
86 #define CHECK_FCCONFIG(x) CHECK_RECORD (x, fc_config) 86 #define CHECK_FC_CONFIG(x) CHECK_RECORD (x, fc_config)
87 #define CONCHECK_FCCONFIG(x) CONCHECK_RECORD (x, fc_config) 87 #define CONCHECK_FC_CONFIG(x) CONCHECK_RECORD (x, fc_config)
88 #define XFCCONFIG_PTR(x) (XFCCONFIG(x)->fccfgPtr) 88 #define XFC_CONFIG_PTR(x) (XFC_CONFIG(x)->fccfgPtr)
89 89
90 #endif /* FONTCONFIG_EXPOSE_CONFIG */ 90 #endif /* FONTCONFIG_EXPOSE_CONFIG */
91 91
92 #ifdef HAVE_XFT 92 #ifdef HAVE_XFT
93 93