Kaydet (Commit) 844f7ddc authored tarafından Georg Brandl's avatar Georg Brandl

Patch #1527744: right order of includes in order to have HAVE_CONIO_H defined properly.

üst ced52a97
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <Python.h>
#ifdef HAVE_CONIO_H #ifdef HAVE_CONIO_H
#include <conio.h> /* port functions on Win9x */ #include <conio.h> /* port functions on Win9x */
#endif #endif
#include <Python.h>
PyDoc_STRVAR(sound_playsound_doc, PyDoc_STRVAR(sound_playsound_doc,
"PlaySound(sound, flags) - a wrapper around the Windows PlaySound API\n" "PlaySound(sound, flags) - a wrapper around the Windows PlaySound API\n"
...@@ -147,7 +147,7 @@ sound_beep(PyObject *self, PyObject *args) ...@@ -147,7 +147,7 @@ sound_beep(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
} }
#ifdef _M_IX86 #if defined(_M_IX86) && defined(HAVE_CONIO_H)
else if (whichOS == Win9X) { else if (whichOS == Win9X) {
int speaker_state; int speaker_state;
/* Force timer into oscillator mode via timer control port. */ /* Force timer into oscillator mode via timer control port. */
...@@ -172,7 +172,7 @@ sound_beep(PyObject *self, PyObject *args) ...@@ -172,7 +172,7 @@ sound_beep(PyObject *self, PyObject *args)
/* Restore speaker control to original state. */ /* Restore speaker control to original state. */
_outp(0x61, speaker_state); _outp(0x61, speaker_state);
} }
#endif /* _M_IX86 */ #endif /* _M_IX86 && HAVE_CONIO_H */
else { else {
assert(!"winsound's whichOS has insane value"); assert(!"winsound's whichOS has insane value");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment