Attachment #861386 for bug #906018

View | Details | Raw Unified | Return to bug 906018
Collapse All | Expand All

Lines 88-101 while (<>) { Link Here

(-)a/gdk/makegdkalias.pl (-3 / +28 lines)
88	print $_;	88	print $_;
89		89
90	next;	90	next;
91	}	91	}
92		92
93	if ($_ =~ /^\#if.*(IN_FILE\|IN_HEADER)/)	93	if ($_ =~ /^\#if.*(IN_FILE)/)
94	{	94	{
95	print $_;	95	if ($do_def)
96		96	{
		97	$_ =~ s/IN_FILE(.*)/1/;
		98	print $_;
		99	}
		100	else
		101	{
		102	$_ =~ s/IN_FILE/defined/, "\n";
		103	print $_;
		104	}
		105
		106	next;
		107	}
		108
		109	if ($_ =~ /^\#if.*(IN_HEADER)/)
		110	{
		111	if ($do_def)
		112	{
		113	$_ =~ s/IN_HEADER/defined/;
		114	print $_;
		115	}
		116	else
		117	{
		118	$_ =~ s/IN_HEADER(.*)/1/;
		119	print $_;
		120	}
		121
97	next;	122	next;
98	}	123	}
99		124
100	chop;	125	chop;
101	my $str = $_;	126	my $str = $_;





#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 (<>) {


      print $_;
      
      next;
  }
 
  if ($_ =~ /^\#if.*(IN_FILE)/)
  {
      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 = $_;

Return to bug 906018

Lines 16-43 print <<EOF; Link Here

(-)a/gtk/makegtkalias.pl (-21 / +28 lines)
16		16
17	#ifdef G_HAVE_GNUC_VISIBILITY	17	#ifdef G_HAVE_GNUC_VISIBILITY
18		18
19	EOF	19	EOF
20		20
21	if ($do_def) {
22	print <<EOF
23	#undef IN_FILE
24	#define IN_FILE defined
25
26	#undef IN_HEADER
27	#define IN_HEADER(x) 1
28
29	EOF
30	}
31	else {
32	print <<EOF
33	#define IN_FILE(x) 1
34	#define IN_HEADER defined
35
36	EOF
37	}
38
39	my $in_comment = 0;	21	my $in_comment = 0;
40	my $in_skipped_section = 0;	22	my $in_skipped_section = 0;
41		23
42	while (<>) {	24	while (<>) {
43		25
Lines 95-108 while (<>) { Link Here
95	print $_;	77	print $_;
96		78
97	next;	79	next;
98	}	80	}
99		81
100	if ($_ =~ /^\#if.*(IN_FILE\|IN_HEADER)/)	82	if ($_ =~ /^\#if.*(IN_FILE)/)
101	{	83	{
102	print $_;	84	if ($do_def)
103		85	{
		86	$_ =~ s/IN_FILE/defined/g;
		87	print $_;
		88	}
		89	else
		90	{
		91	$_ =~ s/IN_FILE(.*)/1/g;
		92	print $_;
		93	}
		94
		95	next;
		96	}
		97
		98	if ($_ =~ /^\#if.*(IN_HEADER)/)
		99	{
		100	if ($do_def)
		101	{
		102	$_ =~ s/IN_HEADER(.*)/1/g;
		103	print $_;
		104	}
		105	else
		106	{
		107	$_ =~ s/IN_HEADER/defined/g;
		108	print $_;
		109	}
		110
104	next;	111	next;
105	}	112	}
106		113
107	chop;	114	chop;
108	my $str = $_;	115	my $str = $_;