Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Georg Brandl 2006-07-24 13:46:47 +00:00
parent ced52a97b6
commit 844f7ddcdc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PC/winsound.c
View File

@ -37,10 +37,10 @@
#include <windows.h>
#include <mmsystem.h>
#include <Python.h>
#ifdef HAVE_CONIO_H
#include <conio.h> /* port functions on Win9x */
#endif
#include <Python.h>
PyDoc_STRVAR(sound_playsound_doc,
"PlaySound(sound, flags) - a wrapper around the Windows PlaySound API\n"
@ -147,7 +147,7 @@ sound_beep(PyObject *self, PyObject *args)
return NULL;
}
}
#ifdef _M_IX86
#if defined(_M_IX86) && defined(HAVE_CONIO_H)
else if (whichOS == Win9X) {
int speaker_state;
/* Force timer into oscillator mode via timer control port. */
@ -172,7 +172,7 @@ sound_beep(PyObject *self, PyObject *args)
/* Restore speaker control to original state. */
_outp(0x61, speaker_state);
}
#endif /* _M_IX86 */
#endif /* _M_IX86 && HAVE_CONIO_H */
else {
assert(!"winsound's whichOS has insane value");
}