diff options
author | joerg <joerg@pkgsrc.org> | 2012-07-09 19:08:04 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-07-09 19:08:04 +0000 |
commit | 04d0b1b8d09d481761f5097f0de9ee8c777658ea (patch) | |
tree | 1efd8c8537ff1fd7f30c0b9e6e1f1968c4d0a4bf /games | |
parent | e8f5f582c1d60e6044a3b7fa7a5cb8f1ffe24509 (diff) | |
download | pkgsrc-04d0b1b8d09d481761f5097f0de9ee8c777658ea.tar.gz |
Fix inline usage.
Diffstat (limited to 'games')
-rw-r--r-- | games/lgeneral/distinfo | 5 | ||||
-rw-r--r-- | games/lgeneral/patches/patch-src_misc.c | 37 | ||||
-rw-r--r-- | games/lgeneral/patches/patch-src_misc.h | 21 | ||||
-rw-r--r-- | games/lgeneral/patches/patch-src_sdl.c | 13 |
4 files changed, 75 insertions, 1 deletions
diff --git a/games/lgeneral/distinfo b/games/lgeneral/distinfo index 5149bef6278..9b230fbe9c8 100644 --- a/games/lgeneral/distinfo +++ b/games/lgeneral/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 23:12:00 agc Exp $ +$NetBSD: distinfo,v 1.3 2012/07/09 19:08:04 joerg Exp $ SHA1 (lgeneral-1.1.1.tar.gz) = 37ce2f59ec4654893fa864a7582981683e389df8 RMD160 (lgeneral-1.1.1.tar.gz) = f4ca361e8b3d180e0fb7136f86cc6412a82974fb Size (lgeneral-1.1.1.tar.gz) = 588698 bytes SHA1 (patch-aa) = ae6f56a9efb5024e5160d2b05aba73d26cecd16b SHA1 (patch-ab) = 118eaa7e52e793eed9e2518f373d400dff4f9d51 +SHA1 (patch-src_misc.c) = a8dc0bdd9d13062f00b81340c4e0ac082b0c66bf +SHA1 (patch-src_misc.h) = 33c0da9a7a9204da3f5669c1ebffcd704d0df1ba +SHA1 (patch-src_sdl.c) = e8578587fac0f7ff83a06b952977be5c2561cd5f diff --git a/games/lgeneral/patches/patch-src_misc.c b/games/lgeneral/patches/patch-src_misc.c new file mode 100644 index 00000000000..c23023887a1 --- /dev/null +++ b/games/lgeneral/patches/patch-src_misc.c @@ -0,0 +1,37 @@ +$NetBSD: patch-src_misc.c,v 1.1 2012/07/09 19:08:04 joerg Exp $ + +--- src/misc.c.orig 2012-07-06 16:15:05.000000000 +0000 ++++ src/misc.c +@@ -31,20 +31,20 @@ inline int equal_str( char *str1, char * + } + + /* set delay to ms milliseconds */ +-inline void set_delay( Delay *delay, int ms ) ++void set_delay( Delay *delay, int ms ) + { + delay->limit = ms; + delay->cur = 0; + } + + /* reset delay ( cur = 0 )*/ +-inline void reset_delay( Delay *delay ) ++void reset_delay( Delay *delay ) + { + delay->cur = 0; + } + + /* check if times out and reset */ +-inline int timed_out( Delay *delay, int ms ) ++int timed_out( Delay *delay, int ms ) + { + delay->cur += ms; + if ( delay->cur >= delay->limit ) { +@@ -57,7 +57,7 @@ inline int timed_out( Delay *delay, int + } + + +-inline void goto_tile( int *x, int *y, int d ) ++static inline void goto_tile( int *x, int *y, int d ) + { + /* 0 -up, clockwise, 5 - left up */ + switch ( d ) { diff --git a/games/lgeneral/patches/patch-src_misc.h b/games/lgeneral/patches/patch-src_misc.h new file mode 100644 index 00000000000..09852cd0352 --- /dev/null +++ b/games/lgeneral/patches/patch-src_misc.h @@ -0,0 +1,21 @@ +$NetBSD: patch-src_misc.h,v 1.1 2012/07/09 19:08:04 joerg Exp $ + +--- src/misc.h.orig 2012-07-06 16:15:20.000000000 +0000 ++++ src/misc.h +@@ -51,13 +51,13 @@ typedef struct { + } Delay; + + /* set delay to ms milliseconds */ +-inline void set_delay( Delay *delay, int ms ); ++void set_delay( Delay *delay, int ms ); + + /* reset delay ( cur = 0 )*/ +-inline void reset_delay( Delay *delay ); ++void reset_delay( Delay *delay ); + + /* check if time's out ( add ms milliseconds )and reset */ +-inline int timed_out( Delay *delay, int ms ); ++int timed_out( Delay *delay, int ms ); + + /* return distance betwteen to map positions */ + int get_dist( int x1, int y1, int x2, int y2 ); diff --git a/games/lgeneral/patches/patch-src_sdl.c b/games/lgeneral/patches/patch-src_sdl.c new file mode 100644 index 00000000000..ab3fcc3ff89 --- /dev/null +++ b/games/lgeneral/patches/patch-src_sdl.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_sdl.c,v 1.1 2012/07/09 19:08:05 joerg Exp $ + +--- src/sdl.c.orig 2012-07-06 16:16:17.000000000 +0000 ++++ src/sdl.c +@@ -31,7 +31,7 @@ int cur_time, last_time; + /* sdl surface */ + + /* return full path of bitmap */ +-inline void get_full_bmp_path( char *full_path, char *file_name ) ++static inline void get_full_bmp_path( char *full_path, char *file_name ) + { + sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name ); + } |