Changeset 745 for trunk/server/source4/heimdal/cf/make-proto.pl

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/heimdal/cf/make-proto.pl (modified) (5 diffs)

trunk/server/source4/heimdal/cf/make-proto.pl

@@ -13 +13 @@
 my $private_func_re = "^_";
 
-do Getopts('x:m:o:p:dqE:R:P:') || die "foo";
+Getopts('x:m:o:p:dqE:R:P:') || die "foo";
 
 if($opt_d) {
@@ -181 +181 @@
     $_ = $arg;
     s/.*\/([^\/]*)/$1/;
+    s/.*\\([^\\]*)/$1/;
     s/[^a-zA-Z0-9]/_/g;
     "__" . $_ . "__";
@@ -254 +255 @@
 foreach(sort keys %funcs){
     if(/^(main)$/) { next }
+    if ($funcs{$_} =~ /\^/) {
+        $beginblock = "#ifdef __BLOCKS__\n";
+        $endblock = "#endif /* __BLOCKS__ */\n";
+    } else {
+        $beginblock = $endblock = "";
+    }
     if(!defined($exported{$_}) && /$private_func_re/) {
-        $private_h .= $funcs{$_} . "\n\n";
+        $private_h .= $beginblock . $funcs{$_} . "\n" . $endblock . "\n";
         if($funcs{$_} =~ /__attribute__/) {
             $private_attribute_seen = 1;
@@ -268 +275 @@
             }
         }
-        $public_h .= $funcs{$_} . "\n";
+        $public_h .= $beginblock . $funcs{$_} . "\n" . $endblock;
         if($funcs{$_} =~ /__attribute__/) {
             $public_attribute_seen = 1;
@@ -311 +318 @@
 if ($opt_E) {
     $public_h_header .= "#ifndef $opt_E
+#ifndef ${opt_E}_FUNCTION
 #if defined(_WIN32)
-#define ${opt_E}_FUNCTION __stdcall __declspec(dllimport)
+#define ${opt_E}_FUNCTION __declspec(dllimport)
+#define ${opt_E}_CALL __stdcall
 #define ${opt_E}_VARIABLE __declspec(dllimport)
 #else
 #define ${opt_E}_FUNCTION
+#define ${opt_E}_CALL
 #define ${opt_E}_VARIABLE
 #endif
 #endif
-
+#endif
 ";
     
     $private_h_header .= "#ifndef $opt_E
+#ifndef ${opt_E}_FUNCTION
 #if defined(_WIN32)
-#define ${opt_E}_FUNCTION __stdcall __declspec(dllimport)
+#define ${opt_E}_FUNCTION __declspec(dllimport)
+#define ${opt_E}_CALL __stdcall
 #define ${opt_E}_VARIABLE __declspec(dllimport)
 #else
 #define ${opt_E}_FUNCTION
+#define ${opt_E}_CALL
 #define ${opt_E}_VARIABLE
+#endif
 #endif
 #endif