kopia lustrzana https://github.com/Hamlib/Hamlib
Revise test for MinGW with sleep()
Revise the preprocessor conditional test for MinGW variables. Tested on all of my MinGW installations. The prior test was broken by MinGW 3.0 on Debian Unstable.Hamlib-3.0
rodzic
1bac099494
commit
c39b51327b
|
@ -58,8 +58,11 @@
|
|||
* MinGW. So substitute the sleep definition below in such a case and
|
||||
* when compiling on Windows using MinGW where HAVE_SLEEP will be
|
||||
* undefined.
|
||||
*
|
||||
* FIXME: Needs better handling for all versions of MinGW.
|
||||
*
|
||||
*/
|
||||
#if defined(HAVE_SSLEEP) && (!defined(HAVE_SLEEP) || defined(_WIN32))
|
||||
#if (defined(HAVE_SSLEEP) || defined(_WIN32)) && (!defined(HAVE_SLEEP))
|
||||
#include "hl_sleep.h"
|
||||
#endif
|
||||
|
||||
|
@ -3823,4 +3826,3 @@ DECLARE_PROBERIG_BACKEND(adat)
|
|||
// ---------------------------------------------------------------------------
|
||||
// END OF FILE
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
|
|
|
@ -45,8 +45,11 @@
|
|||
* MinGW. So substitute the sleep definition below in such a case and
|
||||
* when compiling on Windows using MinGW where HAVE_SLEEP will be
|
||||
* undefined.
|
||||
*
|
||||
* FIXME: Needs better handling for all versions of MinGW.
|
||||
*
|
||||
*/
|
||||
#if defined(HAVE_SSLEEP) && (!defined(HAVE_SLEEP) || defined(_WIN32))
|
||||
#if (defined(HAVE_SSLEEP) || defined(_WIN32)) && (!defined(HAVE_SLEEP))
|
||||
#include "hl_sleep.h"
|
||||
#endif
|
||||
|
||||
|
@ -591,4 +594,3 @@ int tt585_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
|
|||
|
||||
return write_block(&rig->state.rigport, cmd, strlen(cmd));
|
||||
}
|
||||
|
||||
|
|
|
@ -48,8 +48,11 @@
|
|||
* MinGW. So substitute the sleep definition below in such a case and
|
||||
* when compiling on Windows using MinGW where HAVE_SLEEP will be
|
||||
* undefined.
|
||||
*
|
||||
* FIXME: Needs better handling for all versions of MinGW.
|
||||
*
|
||||
*/
|
||||
#if defined(HAVE_SSLEEP) && (!defined(HAVE_SLEEP) || defined(_WIN32))
|
||||
#if (defined(HAVE_SSLEEP) || defined(_WIN32)) && (!defined(HAVE_SLEEP))
|
||||
#include "hl_sleep.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -17,8 +17,11 @@
|
|||
* MinGW. So substitute the sleep definition below in such a case and
|
||||
* when compiling on Windows using MinGW where HAVE_SLEEP will be
|
||||
* undefined.
|
||||
*
|
||||
* FIXME: Needs better handling for all versions of MinGW.
|
||||
*
|
||||
*/
|
||||
#if defined(HAVE_SSLEEP) && (!defined(HAVE_SLEEP) || defined(_WIN32))
|
||||
#if (defined(HAVE_SSLEEP) || defined(_WIN32)) && (!defined(HAVE_SLEEP))
|
||||
#include "hl_sleep.h"
|
||||
#endif
|
||||
|
||||
|
@ -372,4 +375,3 @@ int main (int argc, char *argv[])
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,8 +17,11 @@
|
|||
* MinGW. So substitute the sleep definition below in such a case and
|
||||
* when compiling on Windows using MinGW where HAVE_SLEEP will be
|
||||
* undefined.
|
||||
*
|
||||
* FIXME: Needs better handling for all versions of MinGW.
|
||||
*
|
||||
*/
|
||||
#if defined(HAVE_SSLEEP) && (!defined(HAVE_SLEEP) || defined(_WIN32))
|
||||
#if (defined(HAVE_SSLEEP) || defined(_WIN32)) && (!defined(HAVE_SLEEP))
|
||||
#include "hl_sleep.h"
|
||||
#endif
|
||||
|
||||
|
@ -104,5 +107,3 @@ int main (int argc, char *argv[])
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -58,8 +58,11 @@
|
|||
* MinGW. So substitute the sleep definition below in such a case and
|
||||
* when compiling on Windows using MinGW where HAVE_SLEEP will be
|
||||
* undefined.
|
||||
*
|
||||
* FIXME: Needs better handling for all versions of MinGW.
|
||||
*
|
||||
*/
|
||||
#if defined(HAVE_SSLEEP) && (!defined(HAVE_SLEEP) || defined(_WIN32))
|
||||
#if (defined(HAVE_SSLEEP) || defined(_WIN32)) && (!defined(HAVE_SLEEP))
|
||||
#include "hl_sleep.h"
|
||||
#endif
|
||||
|
||||
|
@ -734,4 +737,3 @@ int rig2mode(RIG *rig, int md, rmode_t *mode, pbwidth_t *width)
|
|||
|
||||
return RIG_OK;
|
||||
}
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue