summaryrefslogtreecommitdiffstatshomepage
path: root/unix
diff options
context:
space:
mode:
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile2
-rw-r--r--unix/modffi.c4
-rw-r--r--unix/modsocket.c3
3 files changed, 5 insertions, 4 deletions
diff --git a/unix/Makefile b/unix/Makefile
index 9d035cab76..fff6fe0944 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -18,7 +18,7 @@ INC += -I$(PY_SRC)
INC += -I$(BUILD)
# compiler settings
-CWARN = -Wall -Werror -Wno-error=cpp
+CWARN = -Wall -Werror
CFLAGS = $(INC) $(CWARN) -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
# Debugging/Optimization
diff --git a/unix/modffi.c b/unix/modffi.c
index c788f5dd26..e019e9fc95 100644
--- a/unix/modffi.c
+++ b/unix/modffi.c
@@ -146,8 +146,8 @@ STATIC mp_obj_t return_ffi_value(ffi_arg val, char type)
case 'v':
return mp_const_none;
case 'f': {
- float *p = (float*)&val;
- return mp_obj_new_float(*p);
+ union { ffi_arg ffi; float flt; } val_union = { .ffi = val };
+ return mp_obj_new_float(val_union.flt);
}
case 'd': {
double *p = (double*)&val;
diff --git a/unix/modsocket.c b/unix/modsocket.c
index be97441af2..76787184a0 100644
--- a/unix/modsocket.c
+++ b/unix/modsocket.c
@@ -371,7 +371,8 @@ STATIC mp_obj_t mod_socket_getaddrinfo(mp_uint_t n_args, const mp_obj_t *args) {
hints.ai_flags = AI_NUMERICSERV;
#ifdef __UCLIBC_MAJOR__
#if __UCLIBC_MAJOR__ == 0 && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
-#warning Working around uClibc bug with numeric service name
+// "warning" requires -Wno-cpp which is a relatively new gcc option, so we choose not to use it.
+//#warning Working around uClibc bug with numeric service name
// Older versions og uClibc have bugs when numeric ports in service
// arg require also hints.ai_socktype (or hints.ai_protocol) != 0
// This actually was fixed in 0.9.32.1, but uClibc doesn't allow to