finish adding ifdef for unix version