Bug 94660

Summary: fix compilation after recent rename
Product: xorg Reporter: Benno Schulenberg <bensberg>
Component: Driver/openchromeAssignee: Openchrome development list <openchrome-devel>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: medium CC: bensberg, kevinbrace
Version: git   
Hardware: Other   
OS: All   
Whiteboard:
i915 platform: i915 features:
Attachments:
Description Flags
renames also the prototype none

Description Benno Schulenberg 2016-03-22 12:59:57 UTC
Created attachment 122480 [details] [review]
renames also the prototype

When renaming UnmapMem to UnmapMMIO it was forgotten to rename also the prototype in the header file.  Attached patch fixes that.

However, with that fix I still cannot compile openchrome.  (I have started using -Werror, to not allow any warnings to slip by unnoticed: export CFLAGS="-g -O2 -Werror" && ./configure && make clean all).

via_ums.c: In functie ‘ums_create’:
via_ums.c:657:11: fout: impliciete declaratie van functie ‘xf86InitFBManager’ [-Werror=implicit-function-declaration]
     ret = xf86InitFBManager(pScreen, &AvailFBArea);
           ^
via_ums.c:668:9: fout: impliciete declaratie van functie ‘xf86InitFBManagerLinear’ [-Werror=implicit-function-declaration]
         xf86InitFBManagerLinear(pScreen, offset, size);

It seems some xf86 header include is missing.
Comment 1 Kevin Brace 2016-03-24 02:08:41 UTC
(In reply to Benno Schulenberg from comment #0)

Hi Benno,

> Created attachment 122480 [details] [review] [review]
> renames also the prototype
> 
> When renaming UnmapMem to UnmapMMIO it was forgotten to rename also the
> prototype in the header file.  Attached patch fixes that.
> 
> However, with that fix I still cannot compile openchrome.  (I have started
> using -Werror, to not allow any warnings to slip by unnoticed: export
> CFLAGS="-g -O2 -Werror" && ./configure && make clean all).
> 
> via_ums.c: In functie ‘ums_create’:
> via_ums.c:657:11: fout: impliciete declaratie van functie
> ‘xf86InitFBManager’ [-Werror=implicit-function-declaration]
>      ret = xf86InitFBManager(pScreen, &AvailFBArea);
>            ^
> via_ums.c:668:9: fout: impliciete declaratie van functie
> ‘xf86InitFBManagerLinear’ [-Werror=implicit-function-declaration]
>          xf86InitFBManagerLinear(pScreen, offset, size);
> 
> It seems some xf86 header include is missing.

Thank you very much for catching my error.
Due to some development issues, I still do not use Eclipse IDE for the master branch code I work on (I am using gedit right now.).
If I were using Eclipse IDE, I would have caught this mistake since it does have a powerful keyword search feature, and I would have used it.
In the near future, I will likely integrate my master branch code with Eclipse IDE after I make a commit related to the rewrite of standby resume code.
After that one, I will commit your fix with the following section added after your Signed-off-by line.

Acked-by: Kevin Brace <kevinbrace@gmx.com>

I hope that is okay.
Comment 2 Benno Schulenberg 2016-03-24 08:27:02 UTC
(In reply to Kevin Brace from comment #1)
> After that one, I will commit your fix with the following section added
> after your Signed-off-by line.
> 
> Acked-by: Kevin Brace <kevinbrace@gmx.com>
> 
> I hope that is okay.

That is perfectly fine.  :)
Comment 3 Kevin Brace 2016-03-25 02:08:11 UTC
(In reply to Benno Schulenberg from comment #2)

Hi Benno,

> (In reply to Kevin Brace from comment #1)
> > After that one, I will commit your fix with the following section added
> > after your Signed-off-by line.
> > 
> > Acked-by: Kevin Brace <kevinbrace@gmx.com>
> > 
> > I hope that is okay.
> 
> That is perfectly fine.  :)

Okay, I will apply your patch after I do a possible commit reversal.
Basically, the code I removed will go back into the repository (I will not erase the history of the commit.), and then I will apply your patch for the commit.
Comment 4 Kevin Brace 2016-03-29 12:38:19 UTC
Fixed by commit 730ea106f21afe48e636d37125ff5afb7225a938.

https://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=730ea106f21afe48e636d37125ff5afb7225a938

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.