[patch] cpp_macro_fix.patch

cpp_macro_fix.patch (text/plain), 1.87 KB, created by nvinson234 on 2023-05-09 11:59:18 UTC

--- a/gdk/makegdkalias.pl	2023-05-08 22:35:35.514840319 -0400
+++ b/gdk/makegdkalias.pl	2023-05-08 22:36:07.102441834 -0400
@@ -88,14 +88,39 @@ while (<>) {
       print $_;
       
       next;
   }
 
-  if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
+  if ($_ =~ /^\#if.*(IN_FILE)/)
   {
-      print $_;
-      
+      if ($do_def)
+      {
+        $_ =~ s/IN_FILE(.*)/1/;
+        print $_;
+      }
+      else
+      {
+        $_ =~ s/IN_FILE/defined/, "\n";
+        print $_;
+      }
+
+      next;
+  }
+
+  if ($_ =~ /^\#if.*(IN_HEADER)/)
+  {
+      if ($do_def)
+      {
+        $_ =~ s/IN_HEADER/defined/;
+        print $_;
+      }
+      else
+      {
+        $_ =~ s/IN_HEADER(.*)/1/;
+        print $_;
+      }
+
       next;
   }
 
   chop;
   my $str = $_;
--- a/gtk/makegtkalias.pl	2023-05-08 22:03:49.694877762 -0400
+++ b/gtk/makegtkalias.pl	2023-05-08 22:36:16.029329216 -0400
@@ -16,28 +16,10 @@ print <<EOF;
 
 #ifdef G_HAVE_GNUC_VISIBILITY
 
 EOF
 
-if ($do_def) {
-    print <<EOF
-#undef IN_FILE
-#define IN_FILE defined
-
-#undef IN_HEADER
-#define IN_HEADER(x) 1
-
-EOF
-} 
-else { 
-    print <<EOF
-#define IN_FILE(x) 1
-#define IN_HEADER defined
-
-EOF
-}
-
 my $in_comment = 0;
 my $in_skipped_section = 0;
 
 while (<>) {
 
@@ -95,14 +77,39 @@ while (<>) {
       print $_;
       
       next;
   }
  
-  if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
+  if ($_ =~ /^\#if.*(IN_FILE)/)
   {
-      print $_;
-      
+      if ($do_def)
+      {
+        $_ =~ s/IN_FILE/defined/g;
+        print $_;
+      }
+      else
+      {
+        $_ =~ s/IN_FILE(.*)/1/g;
+        print $_;
+      }
+
+      next;
+  }
+
+  if ($_ =~ /^\#if.*(IN_HEADER)/)
+  {
+      if ($do_def)
+      {
+        $_ =~ s/IN_HEADER(.*)/1/g;
+        print $_;
+      }
+      else
+      {
+        $_ =~ s/IN_HEADER/defined/g;
+        print $_;
+      }
+
       next;
   }
 
   chop;
   my $str = $_;