X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fperl%2FUCW%2FConfigure%2FC.pm;h=0eca1f98b92c08a00ad1ffd44ad0ec395ab84561;hb=d4123b266f32fe1c84c03cc66ed7cc6c943a355b;hp=301a3a7932b14d0e3bdb893ce2d904b3fb9ea4e9;hpb=613ab6eaf2c1cca56b326f95d3ea8fa470704ac8;p=libucw.git

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index 301a3a79..0eca1f98 100644
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -1,5 +1,5 @@
 # UCW Library configuration system: OS and C compiler
-# (c) 2005--2010 Martin Mares <mj@ucw.cz>
+# (c) 2005--2012 Martin Mares <mj@ucw.cz>
 # (c) 2006 Robert Spalek <robert@ucw.cz>
 # (c) 2008 Michal Vaner <vorner@ucw.cz>
 
@@ -108,7 +108,7 @@ if ($arch =~ /^(i386|amd64)$/ && Get("CONFIG_EXACT_CPU")) {
 Set("COPT2" => '-O3');
 
 # Warnings
-Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline');
+Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes');
 Set("CWARNS_OFF" => '');
 
 # Linker flags
@@ -143,9 +143,6 @@ if ($gccver == 3000) {
 	Append("CWARNS" => "-Wundef -Wredundant-decls -Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers");
 	Append("CWARNS_OFF" => "-Wno-pointer-sign");
 	Append("COPT" => "-finline-limit=5000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
-	if ($gccver >= 4002) {
-		Append("COPT" => "-fgnu89-inline");
-	}
 } else {
 	Warn "Don't know anything about this GCC version, using default switches.\n";
 }
@@ -167,13 +164,6 @@ if (IsSet("CONFIG_DARWIN")) {
 	# Directory hierarchy of the fink project
 	Append("LIBS" => "-L/sw/lib");
 	Append("COPT" => "-I/sw/include");
-	# Fill in some constants not found in the system header files
-	Set("SOL_TCP" => 6);		# missing in /usr/include/netinet/tcp.h
-	if (IsGiven("CONFIG_UCW_DIRECT_IO") && IsSet("CONFIG_UCW_DIRECT_IO")) {
-		Fail("Direct I/O is not available on darwin");
-	} else {
-		UnSet("CONFIG_UCW_DIRECT_IO");
-	}
 }
 
 ### Compiling test programs ###