comparison src/console-msw.c @ 382:064ab7fed2e0 r21-2-6

Import from CVS: tag r21-2-6
author cvs
date Mon, 13 Aug 2007 11:07:39 +0200
parents 7df0dd720c89
children 74fd4e045ea6
comparison
equal deleted inserted replaced
381:908a86f940e6 382:064ab7fed2e0
82 /* 82 /*
83 * Random helper functions for debugging. 83 * Random helper functions for debugging.
84 * Intended for use in the MSVC "Watch" window which doesn't like 84 * Intended for use in the MSVC "Watch" window which doesn't like
85 * the aborts that the error_check_foo() functions can make. 85 * the aborts that the error_check_foo() functions can make.
86 */ 86 */
87 struct lrecord_header *DHEADER(Lisp_Object obj) 87 struct lrecord_header *
88 DHEADER (Lisp_Object obj)
88 { 89 {
89 return (LRECORDP (obj)) ? XRECORD_LHEADER (obj) : NULL; 90 return LRECORDP (obj) ? XRECORD_LHEADER (obj) : NULL;
90 } 91 }
91 92
92 int *DOPAQUE_DATA (Lisp_Object obj) 93 void *
94 DOPAQUE_DATA (Lisp_Object obj)
93 { 95 {
94 return (OPAQUEP (obj)) ? OPAQUE_DATA (XOPAQUE (obj)) : NULL; 96 return OPAQUEP (obj) ? OPAQUE_DATA (XOPAQUE (obj)) : NULL;
95 } 97 }
96 98
97 struct Lisp_Event *DEVENT(Lisp_Object obj) 99 struct Lisp_Event *
100 DEVENT (Lisp_Object obj)
98 { 101 {
99 return (EVENTP (obj)) ? XEVENT (obj) : NULL; 102 return EVENTP (obj) ? XEVENT (obj) : NULL;
100 } 103 }
101 104
102 struct Lisp_Cons *DCONS(Lisp_Object obj) 105 struct Lisp_Cons *
106 DCONS (Lisp_Object obj)
103 { 107 {
104 return (CONSP (obj)) ? XCONS (obj) : NULL; 108 return CONSP (obj) ? XCONS (obj) : NULL;
105 } 109 }
106 110
107 struct Lisp_Cons *DCONSCDR(Lisp_Object obj) 111 struct Lisp_Cons *
112 DCONSCDR (Lisp_Object obj)
108 { 113 {
109 return ((CONSP (obj)) && (CONSP (XCDR (obj)))) ? XCONS (XCDR (obj)) : 0; 114 return (CONSP (obj) && CONSP (XCDR (obj))) ? XCONS (XCDR (obj)) : 0;
110 } 115 }
111 116
112 char *DSTRING(Lisp_Object obj) 117 Bufbyte *
118 DSTRING (Lisp_Object obj)
113 { 119 {
114 return (STRINGP (obj)) ? XSTRING_DATA (obj) : NULL; 120 return STRINGP (obj) ? XSTRING_DATA (obj) : NULL;
115 } 121 }
116 122
117 struct Lisp_Vector *DVECTOR(Lisp_Object obj) 123 struct Lisp_Vector *
124 DVECTOR (Lisp_Object obj)
118 { 125 {
119 return (VECTORP (obj)) ? XVECTOR (obj) : NULL; 126 return VECTORP (obj) ? XVECTOR (obj) : NULL;
120 } 127 }
121 128
122 struct Lisp_Symbol *DSYMBOL(Lisp_Object obj) 129 struct Lisp_Symbol *
130 DSYMBOL (Lisp_Object obj)
123 { 131 {
124 return (SYMBOLP (obj)) ? XSYMBOL (obj) : NULL; 132 return SYMBOLP (obj) ? XSYMBOL (obj) : NULL;
125 } 133 }
126 134
127 char *DSYMNAME(Lisp_Object obj) 135 Bufbyte *
136 DSYMNAME (Lisp_Object obj)
128 { 137 {
129 return (SYMBOLP (obj)) ? XSYMBOL (obj)->name->_data : NULL; 138 return SYMBOLP (obj) ? string_data (XSYMBOL (obj)->name) : NULL;
130 } 139 }
131 140
132 #endif 141 #endif