I'll also throw in PG Wodehouse for those with a more literary interest.
I’m gonna skip over the obvious and say that Edward Gibbon and Alexander Solzhenitsyn were very funny writers.
Here, here. Wodehouse is the funniest man who ever lived.