Fix merge oops.

trainman419 · trainman419 · commit 140fd0f2a557 · 2017-11-03T17:37:34.000-07:00
diff --git a/cec.cpp b/cec.cpp
@@ -502,7 +502,6 @@ static PyObject * set_stream_path(PyObject * self, PyObject * args) {
             Py_DECREF(arg);
             return NULL;
          }
-#endif
       } else if(PyUnicode_Check(arg)) {
          // Convert from Unicode to ASCII
          PyObject* ascii_arg = PyUnicode_AsASCIIString(arg);

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,6 @@ static PyObject * set_stream_path(PyObject * self, PyObject * args) {`
`502`	`502`	`Py_DECREF(arg);`
`503`	`503`	`return NULL;`
`504`	`504`	`}`
`505`		`-#endif`
`506`	`505`	`} else if(PyUnicode_Check(arg)) {`
`507`	`506`	`// Convert from Unicode to ASCII`
`508`	`507`	`PyObject* ascii_arg = PyUnicode_AsASCIIString(arg);`