Suggested by d_layer: Remove -Wconversion. I had planted these flags
here
because they were used in the original makefile from before the import.
I was trying to remove the warnings in a hurry and didn't think to
check.
Modified: trunk/reactos/lib/adns/Makefile
Modified: trunk/reactos/lib/adns/adns_win32/adns_win32.h
_____
Modified: trunk/reactos/lib/adns/Makefile
--- trunk/reactos/lib/adns/Makefile 2005-03-04 09:43:34 UTC (rev
13815)
+++ trunk/reactos/lib/adns/Makefile 2005-03-04 11:40:10 UTC (rev
13816)
@@ -7,7 +7,7 @@
TARGET_NAME = adns
TARGET_CFLAGS = \
- -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+ -O3 -Wall -Wwrite-strings -Wpointer-arith \
-Wstrict-prototypes -Wmissing-prototypes -Wall -DADNS_JGAA_WIN32
-D__USE_W32API -D__REACTOS__
# require os code to explicitly request A/W version of
structs/functions
_____
Modified: trunk/reactos/lib/adns/adns_win32/adns_win32.h
--- trunk/reactos/lib/adns/adns_win32/adns_win32.h 2005-03-04
09:43:34 UTC (rev 13815)
+++ trunk/reactos/lib/adns/adns_win32/adns_win32.h 2005-03-04
11:40:10 UTC (rev 13816)
@@ -157,34 +157,5 @@
#include "timercmp.h" /* arty added: mingw headers don't seem to have
it */
-/*
- * <rant>
- * These fix the following warning in GCC:
- * warning: passing arg 1 of `ntohs' with different width due to
prototype
- *
- * Even if you declare an unsigned char or unsigned short variable and
pass
- * it to htons or ntohs, this warning will be generated. I believe
this is
- * a gcc bug. You can try to reproduce the bug like this:
- *
- * u_short foo(u_short bar) {
- * return htons(bar);
- * }
- *
- * Using the reactos compiler settings this generates the error.
Unless I'm
- * missing something, the active prototypes for htons and ntohs are:
- *
- * u_short PASCAL htons(u_short);
- * u_short PASCAL ntohs(u_short);
- *
- * From winsock2.h. Since the function above has exactly the same
signature
- * as htons except for the required PASCAL (__stdcall) decoration, gcc
is
- * erroneously detecting a narrowed value.
- * </rant>
- */
-#ifdef __REACTOS__
-#define htons(x) ((((x)&0xff)<<8)|(((x)>>8)&0xff))
-#define ntohs(x) htons(x)
-#endif
-
#endif /* ADNS_WIN32_H_INCLUDED */