Changeset 284

Timestamp:

10/31/05 13:47:33

Author:

ben

Message:

Declarations still have to be at the beginning.

Files:

• openpgpsdk/trunk/configure (modified) (3 diffs)
• openpgpsdk/trunk/src/errors.c (modified) (2 diffs)

openpgpsdk/trunk/configure

@@ -76 +76 @@
-                path => sub { return [split /:/,$ENV{PATH}]; },
-                time_t => sub { return typeInfo('time_t','time.h'); },
-
+
+
+
+
-              );
-
@@ -92 +95 @@
-#my $os=`uname -s`;
-
-checkHeaders(\@RHeaders);
-
-$Subst{'CC'}=getKnowledge('cc');
-$Subst{'CFLAGS'}.=' '.getKnowledge('base_cflags');
+
+checkHeaders(\@RHeaders);
-
-findHeaders(\@Headers);
@@ -305 +308 @@
-}
-
+sub baseCFlags {
+    my $flags='';
+    if(getKnowledge('is_gcc')) {
+        $flags='-Wall -Werror -W -g';
+        my $v=getKnowledge('gcc_major');
+        $flags.=' -Wdeclaration-after-statement' if $v >= 3;
+    }
+    return $flags;
+}
+
+sub isGCC {
+    my $cc=getKnowledge('cc');
+
+    my $ret=build("int main()\n{\n#ifndef __GNUC__\n  syntax error\n#endif\n return 0; }\n");
+    trace("isGCC=$ret\n");
+    return $ret;
+}
+
+sub gccVersion {
+    return undef if !getKnowledge('is_gcc');
+
+    my $cc=getKnowledge('cc');
+    my $vstr=`$cc --version`;
+
+    my($v)=$vstr =~ /(\d+\.\d+\.\d+)/;
+
+    trace("gcc version=$v\n");
+
+    return $v;
+}
+
+sub gccMajor {
+    my $v=getKnowledge('gcc_version');
+    return undef if !defined $v;
+
+    ($v)=$v =~ /^(\d+)/;
+
+    trace("gcc major=$v\n");
+
+    return $v;
+}

openpgpsdk/trunk/src/errors.c

@@ -29 +29 @@
-    int maxbuf=128;
-    va_list args;
+    ops_error_t *err;
-    
-    comment=malloc(maxbuf+1);
@@ -40 +41 @@
-    // alloc a new error and add it to the top of the stack
-
-ops_error_t *
+
-    assert(err);
-