diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index 056a24316f3dfab43d04d6bec5746d675a30819b..d2551461b2cd2389429a2b8d235d9845e34c25c4 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -504,8 +504,7 @@ def _parse_context_properties(properties):
         if prop == context_properties.PLATFORM:
             props.append(value.int_ptr)
 
-        # TODO: used to be ifdef _WIN32? Why?
-        elif prop == getattr(context_properties, "WGL_HDC_KHR"):
+        elif prop == getattr(context_properties, "WGL_HDC_KHR", None):
             props.append(value)
 
         elif prop in [getattr(context_properties, key, None) for key in (
diff --git a/src/c_wrapper/wrap_constants.cpp b/src/c_wrapper/wrap_constants.cpp
index ed6e1f7c98b9c3a7c39efb8dd6bb49c7ccdac672..94b9d8c2b76bbb4d89c78c6e61dea1b068b5220c 100644
--- a/src/c_wrapper/wrap_constants.cpp
+++ b/src/c_wrapper/wrap_constants.cpp
@@ -11,7 +11,7 @@ namespace pyopencl {
     add("program_kind", "UNKNOWN", KND_UNKNOWN);
     add("program_kind", "SOURCE", KND_SOURCE);
     add("program_kind", "BINARY", KND_BINARY);
-    
+
     // status_code
     ADD_ATTR("status_code", , SUCCESS);
     ADD_ATTR("status_code", , DEVICE_NOT_FOUND);