diff options
author | amdmi3 <amdmi3@FreeBSD.org> | 2009-03-26 06:34:30 +0800 |
---|---|---|
committer | amdmi3 <amdmi3@FreeBSD.org> | 2009-03-26 06:34:30 +0800 |
commit | 6bb6dfcecb49c5d2dc6744d4044b55cfbfd6b0e8 (patch) | |
tree | b6fedb8da1d82187e40ae6d479fcaad345c09376 | |
parent | c30cc51d41bc829f3e3af3be270d5db384f8c56b (diff) | |
download | freebsd-ports-gnome-6bb6dfcecb49c5d2dc6744d4044b55cfbfd6b0e8.tar.gz freebsd-ports-gnome-6bb6dfcecb49c5d2dc6744d4044b55cfbfd6b0e8.tar.zst freebsd-ports-gnome-6bb6dfcecb49c5d2dc6744d4044b55cfbfd6b0e8.zip |
- Fix the build on -CURRENT by removing inline from public function definitions
-rw-r--r-- | games/lpairs/files/patch-lpairs-pairs.h | 15 | ||||
-rw-r--r-- | games/lpairs/files/patch-lpairs-sdl.h | 45 | ||||
-rw-r--r-- | games/xqf/files/patch-src-debug.h | 11 | ||||
-rw-r--r-- | graphics/liblqr-1/files/patch-lqr-lqr_carver_priv.h | 11 |
4 files changed, 82 insertions, 0 deletions
diff --git a/games/lpairs/files/patch-lpairs-pairs.h b/games/lpairs/files/patch-lpairs-pairs.h new file mode 100644 index 000000000000..ef9e063b25e1 --- /dev/null +++ b/games/lpairs/files/patch-lpairs-pairs.h @@ -0,0 +1,15 @@ +--- lpairs/pairs.h.orig 2005-09-27 18:02:58.000000000 +0400 ++++ lpairs/pairs.h 2009-03-25 22:04:25.000000000 +0300 +@@ -102,10 +102,10 @@ + void draw_button( Pairs *pairs, int map_x, int map_y, int type ); + + /* get map contents at position */ +-inline int get_map_cont( Pairs *pairs, int map_x, int map_y ); ++int get_map_cont( Pairs *pairs, int map_x, int map_y ); + + /* set map contents at position */ +-inline void set_map_cont( Pairs *pairs, int map_x, int map_y, int cont ); ++void set_map_cont( Pairs *pairs, int map_x, int map_y, int cont ); + + /* draw all buttons */ + void draw_all_buttons( Pairs *pairs, int type ); diff --git a/games/lpairs/files/patch-lpairs-sdl.h b/games/lpairs/files/patch-lpairs-sdl.h new file mode 100644 index 000000000000..2605e7a271df --- /dev/null +++ b/games/lpairs/files/patch-lpairs-sdl.h @@ -0,0 +1,45 @@ +--- lpairs/sdl.h.orig 2001-03-16 21:43:22.000000000 +0300 ++++ lpairs/sdl.h 2009-03-25 22:04:45.000000000 +0300 +@@ -40,8 +40,8 @@ + SDL_Surface* load_surf(char *fname, int f); + SDL_Surface* create_surf(int w, int h, int f); + int disp_format(SDL_Surface *sur); +-inline void lock_surf(SDL_Surface *sur); +-inline void unlock_surf(SDL_Surface *sur); ++void lock_surf(SDL_Surface *sur); ++void unlock_surf(SDL_Surface *sur); + void blit_surf(void); + void alpha_blit_surf(int alpha); + void fill_surf(int c); +@@ -86,8 +86,8 @@ + Font* load_fixed_font(char *fname, int off, int len, int w); + void free_font(Font *sfnt); + int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha); +-inline void lock_font(Font *sfnt); +-inline void unlock_font(Font *sfnt); ++void lock_font(Font *sfnt); ++void unlock_font(Font *sfnt); + SDL_Rect last_write_rect(Font *fnt); + int text_width(Font *fnt, char *str); + +@@ -116,16 +116,16 @@ + void quit_sdl(); + int set_video_mode( int w, int h, int d, int f ); + void hardware_cap(); +-inline void refresh_screen( int x, int y, int w, int h ); ++void refresh_screen( int x, int y, int w, int h ); + void refresh_rects(); + void add_refresh_rect(int x, int y, int w, int h); + void dim_screen(int steps, int delay, int trp); + void undim_screen(int steps, int delay, int trp); + int wait_for_key(); + void wait_for_click(); +-inline void lock_screen(); +-inline void unlock_screen(); +-inline void flip_screen(); ++void lock_screen(); ++void unlock_screen(); ++void flip_screen(); + + /* cursor */ + /* creates cursor */ diff --git a/games/xqf/files/patch-src-debug.h b/games/xqf/files/patch-src-debug.h new file mode 100644 index 000000000000..f51ac529a29d --- /dev/null +++ b/games/xqf/files/patch-src-debug.h @@ -0,0 +1,11 @@ +--- src/debug.h.orig 2004-01-01 15:41:10.000000000 +0300 ++++ src/debug.h 2009-03-25 22:03:41.000000000 +0300 +@@ -37,7 +37,7 @@ + void debug_int(const char* file, int line, const char* function, int level, const char* fmt, ...); + void debug_cmd(int, char *[], char *, ...); + void set_debug_level (int); +-inline int get_debug_level (void); ++int get_debug_level (void); + + int debug_increase_indent(void); + int debug_decrease_indent(void); diff --git a/graphics/liblqr-1/files/patch-lqr-lqr_carver_priv.h b/graphics/liblqr-1/files/patch-lqr-lqr_carver_priv.h new file mode 100644 index 000000000000..d2f44533cccc --- /dev/null +++ b/graphics/liblqr-1/files/patch-lqr-lqr_carver_priv.h @@ -0,0 +1,11 @@ +--- lqr/lqr_carver_priv.h.orig 2008-11-01 04:42:18.000000000 +0300 ++++ lqr/lqr_carver_priv.h 2009-03-25 22:02:08.000000000 +0300 +@@ -204,7 +204,7 @@ + LqrRetVal lqr_carver_build_vsmap (LqrCarver * r, gint depth); /* visibility */ + + /* internal functions for maps computation */ +-inline gfloat lqr_carver_read (LqrCarver * r, gint x, gint y); /* read the average value at given point */ ++gfloat lqr_carver_read (LqrCarver * r, gint x, gint y); /* read the average value at given point */ + void lqr_carver_compute_e (LqrCarver * r, gint x, gint y); /* compute energy of point at c (fast) */ + void lqr_carver_update_emap (LqrCarver * r); /* update energy map after seam removal */ + void lqr_carver_update_mmap (LqrCarver * r); /* minpath */ |