the two definitions (general Personal Computer, or IBM-compatible) always co-existed in different contexts.

aside - even though Apple ads really drove the Macs Vs PCs thing - before they went Intel, Apple computers used to have IBM PowerPC architecture processors.