History

Fix last commit

it wasn't complete.

Michael Matz committed 7 years ago

Commit cb73be51 parent c3f09371 file · +6 −2Browse files

Unified · Split

tccgen.c+6−2
@@ -957,8 +957,12 @@ static void patch_type(Sym *sym, CType *type) · 956 unmodified lines
957 957
958 /* Force external definition if unequal inline specifier958 /* Force external definition if unequal inline specifier
959 or an explicit extern one. */959 or an explicit extern one. */
960 if ((type->t & VT_INLINE) != (sym->type.t & VT_INLINE)960 if ((sym->type.t | type->t) & VT_STATIC) {
961 || (type->t | sym->type.t) & VT_EXTERN) {961 type->t |= sym->type.t & VT_INLINE;
962 sym->type.t |= type->t & VT_INLINE;
963 } else if (((type->t & VT_INLINE) != (sym->type.t & VT_INLINE)
964 || (type->t | sym->type.t) & VT_EXTERN)
965 && !static_proto) {
962 type->t &= ~VT_INLINE;966 type->t &= ~VT_INLINE;
963 sym->type.t &= ~VT_INLINE;967 sym->type.t &= ~VT_INLINE;
964 }968 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t