Well we should note that 30 million (9%) have diabetes, 7 million of them don't even know it.  So add the 84 million (~33%) to that and we get 114 million (42%) with either condition.  And since Type 1 is much less common, it's basically all type 2 so we can safely say ~42% of Americans are Type 2 or pre-Type 2.