Log Message: Add patch from Thomas E. Dickey to address the build problems from PR 48031 and PR 48035.