Skip to content

Commit

Permalink
* Some GCC 4.0 issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Wielemaker committed Apr 19, 2005
1 parent a19b36e commit 641bbb1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,6 +1,9 @@
XPCE ChangeLog
==============

* PORT: Some of the GCC 4.0 issues (handling names and visibility attribute)


VERSION 6.5.14, distributed with SWI-Prolog 5.5.14
==================================================

Expand Down
32 changes: 18 additions & 14 deletions src/h/kernel.h
Expand Up @@ -466,7 +466,7 @@ void clearDFlagProgramObject(Any, unsigned long);


/********************************
* CHAR_ARRAY, STRING, NAME *
* CHAR_ARRAY, STRING *
********************************/

#include "str.h" /* string type and friends */
Expand All @@ -478,19 +478,6 @@ void clearDFlagProgramObject(Any, unsigned long);
: (size) * sizeof(charA)); \
String name = fstr_inithdr(&_s_ ## name ## _hdr, iswide, _s_ ## name ## _buf, size)

#ifndef NO_BUILT_IN_DECL
extern struct name builtin_names[]; /* object-array of built-in's */
#endif
#include "names.ih" /* #defines for code used names */

#define isName(name) (isObject(name) && onFlag((name), F_ISNAME))
#define notName(name) (!isName(name))
#define equalName(a, b) ((a) == (b))
#define strName(s) ((char *)((Name)(s))->data.s_textA)

#define getAppendName(n, s) \
((Name) getAppendCharArray((CharArray)(n), (CharArray)(s)))

/********************************
* OBJECT HEADER *
********************************/
Expand Down Expand Up @@ -1407,6 +1394,23 @@ struct class_definition
char * summary; /* Summary description */
};

/*******************************
* NAMES *
*******************************/

#ifndef NO_BUILT_IN_DECL
extern struct name builtin_names[]; /* object-array of built-in's */
#endif
#include "names.ih" /* #defines for code used names */

#define isName(name) (isObject(name) && onFlag((name), F_ISNAME))
#define notName(name) (!isName(name))
#define equalName(a, b) ((a) == (b))
#define strName(s) ((char *)((Name)(s))->data.s_textA)

#define getAppendName(n, s) \
((Name) getAppendCharArray((CharArray)(n), (CharArray)(s)))


/********************************
* FORWARDING *
Expand Down

0 comments on commit 641bbb1

Please sign in to comment.