X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flibsigrok-internal.h;h=50f83bd1b54e267b752bdc18a53c3835d4de7a19;hb=3ad0308c554029906040442d376312d128c2b51f;hp=65aedbe4ce22e27b390bdccd3491e397fc633e2b;hpb=9456d63610dfda13f928358ec94c9f6995a47338;p=libsigrok.git diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index 65aedbe4..50f83bd1 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -745,7 +745,7 @@ struct drv_context { /*--- log.c -----------------------------------------------------------------*/ -#if defined(G_OS_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +#if defined(_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) /* * On MinGW, we need to specify the gnu_printf format flavor or GCC * will assume non-standard Microsoft printf syntax. @@ -978,9 +978,9 @@ SR_PRIV GVariant *std_gvar_min_max_step_thresholds(const double dmin, const doub SR_PRIV GVariant *std_gvar_tuple_u64(uint64_t low, uint64_t high); SR_PRIV GVariant *std_gvar_tuple_double(double low, double high); -SR_PRIV GVariant *std_gvar_array_i32(const int32_t *a, unsigned int n); -SR_PRIV GVariant *std_gvar_array_u32(const uint32_t *a, unsigned int n); -SR_PRIV GVariant *std_gvar_array_u64(const uint64_t *a, unsigned int n); +SR_PRIV GVariant *std_gvar_array_i32(const int32_t a[], unsigned int n); +SR_PRIV GVariant *std_gvar_array_u32(const uint32_t a[], unsigned int n); +SR_PRIV GVariant *std_gvar_array_u64(const uint64_t a[], unsigned int n); SR_PRIV GVariant *std_gvar_array_str(const char *a[], unsigned int n); SR_PRIV GVariant *std_gvar_thresholds(const double a[][2], unsigned int n);