• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/ltris/0001-fix-gcc5-build.patch
Rodrigo RebelloRodrigo Rebello committed 3120db1508e12 Nov 2015
Raw file
Source viewDiff to previous
xxxxxxxxxx
 #define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) )
 
1
Upstream patch to fix build with GCC 5
2
​
3
Obtained from the LGames Subversion repository with the following command:
4
svn diff -c164 svn://svn.code.sf.net/p/lgames/code/trunk/ltris
5
​
6
Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
7
​
8
Revision log message:
9
------------------------------------------------------------------------
10
r164 | kulkanie | 2015-05-16 05:48:02 -0300 (Sat, 16 May 2015) | 1 line
11
​
12
removed all inline keywords
13
------------------------------------------------------------------------
14
​
15
Line added to LTris ChangeLog concerning the change:
16
- removed all inline keywords to work with GCC 5 (2015/05/16 MS)
17
​
18
Author: Michael Speck
19
​
20
Index: src/sdl.c
21
===================================================================
22
--- a/src/sdl.c (revision 163)
23
+++ b/src/sdl.c (revision 164)
24
@@ -244,7 +244,7 @@
25
 #endif
26
 
27
 /* return full path of bitmap */
28
-inline void get_full_bmp_path( char *full_path, char *file_name )
29
+void get_full_bmp_path( char *full_path, char *file_name )
30
 {
31
     sprintf(full_path,  "%s/gfx/%s", SRC_DIR, file_name );
32
 }
33
@@ -330,7 +330,7 @@
34
 /*
35
     lock surface
36
 */
37
-inline void lock_surf(SDL_Surface *sur)
38
+void lock_surf(SDL_Surface *sur)
39
 {
40
     if (SDL_MUSTLOCK(sur))
41
         SDL_LockSurface(sur);
42
@@ -339,7 +339,7 @@
43
 /*
44
     unlock surface
45
 */
46
-inline void unlock_surf(SDL_Surface *sur)
47
+void unlock_surf(SDL_Surface *sur)
48
 {
49
     if (SDL_MUSTLOCK(sur))
50
         SDL_UnlockSurface(sur);
51
@@ -666,7 +666,7 @@
52
 /*
53
     lock font surface
54
 */
55
-inline void lock_font(Font *fnt)
56
+void lock_font(Font *fnt)
57
 {
58
     if (SDL_MUSTLOCK(fnt->pic))
59
         SDL_LockSurface(fnt->pic);
60
@@ -675,7 +675,7 @@
61
 /*
62
     unlock font surface
63
 */
64
-inline void unlock_font(Font *fnt)
65
+void unlock_font(Font *fnt)
66
 {
67
     if (SDL_MUSTLOCK(fnt->pic))
68
         SDL_UnlockSurface(fnt->pic);
69
@@ -905,7 +905,7 @@
70
 /*
71
     update rectangle (0,0,0,0)->fullscreen
72
 */
73
-inline void refresh_screen(int x, int y, int w, int h)
74
+void refresh_screen(int x, int y, int w, int h)
75
 {
76
     SDL_UpdateRect(sdl.screen, x, y, w, h);
77
 }
78
@@ -1055,7 +1055,7 @@
79
 /*
80
     lock surface
81
 */
82
-inline void lock_screen()
83
+void lock_screen()
84
 {
85
     if (SDL_MUSTLOCK(sdl.screen))
86
         SDL_LockSurface(sdl.screen);
87
@@ -1064,7 +1064,7 @@
88
 /*
89
     unlock surface
90
 */
91
-inline void unlock_screen()
92
+void unlock_screen()
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.