Changeset 988 for vendor/current/source4/heimdal/cf

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/heimdal/cf/make-proto.pl (modified) (8 diffs)

vendor/current/source4/heimdal/cf/make-proto.pl

@@ -3 +3 @@
 
 use Getopt::Std;
-#require 'getopts.pl';
 
 my $comment = 0;
@@ -12 +11 @@
 my $oproto = 1;
 my $private_func_re = "^_";
+my %depfunction = ();
 
 getopts('x:m:o:p:dqE:R:P:') || die "foo";
@@ -26 +26 @@
     $private_func_re = $opt_R;
 }
-%flags = (
+my %flags = (
           'multiline-proto' => 1,
           'header' => 1,
@@ -101 +101 @@
         s/\s*$//;
         s/\s+/ /g;
-        if($_ =~ /\)$/ or $_ =~ /DEPRECATED$/){
+        if($_ =~ /\)$/){
             if(!/^static/ && !/^PRIVATE/){
                 $attr = "";
@@ -108 +108 @@
                     $_ = $1;
                 }
-                if(m/(.*)\s(\w+DEPRECATED)/) {
+                if(m/(.*)\s(\w+DEPRECATED_FUNCTION)\s?(\(.*\))(.*)/) {
+                    $depfunction{$2} = 1;
+                    $attr .= " $2$3";
+                    $_ = "$1 $4";
+                }
+                if(m/(.*)\s(\w+DEPRECATED)(.*)/) {
                     $attr .= " $2";
-                    $_ = $1;
+                    $_ = "$1 $3";
                 }
                 # remove outer ()
@@ -303 +308 @@
     }
 }
+
+my $depstr = "";
+my $undepstr = "";
+foreach (keys %depfunction) {
+    $depstr .= "#ifndef $_
+#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
+#define $_(X) __attribute__((__deprecated__))
+#else
+#define $_(X)
+#endif
+#endif
+
+
+";
+    $public_h_trailer .= "#undef $_
+
+";
+    $private_h_trailer .= "#undef $_
+#define $_(X)
+
+";
+}
+
+$public_h_header .= $depstr;
+$private_h_header .= $depstr;
+
+
 if($flags{"cxx"}) {
     $public_h_header .= "#ifdef __cplusplus
@@ -309 +341 @@
 
 ";
-    $public_h_trailer .= "#ifdef __cplusplus
-}
-#endif
-
-";
+    $public_h_trailer = "#ifdef __cplusplus
+}
+#endif
+
+" . $public_h_trailer;
 
 }
@@ -349 +381 @@
 }
     
+$public_h_trailer .= $undepstr;
+$private_h_trailer .= $undepstr;
+
 if ($public_h ne "" && $flags{"header"}) {
     $public_h = $public_h_header . $public_h .