diff options
author | EliteTK <tomasz.kramkowski@gmail.com> | 2014-11-17 00:47:25 +0000 |
---|---|---|
committer | EliteTK <tomasz.kramkowski@gmail.com> | 2014-11-17 00:49:58 +0000 |
commit | e5784dbbc7ed58d265927f4ee97a7428f94fae1e (patch) | |
tree | 3e51b3c300f4261b7619d9bd72dc85ec5da09d47 | |
parent | f7edafe7752c7545deb43e2b253735b7abd4b7cd (diff) | |
parent | 697360a05a603db88f945388386ffa5ba32dfcf6 (diff) | |
download | c-stuff-e5784dbbc7ed58d265927f4ee97a7428f94fae1e.tar.gz c-stuff-e5784dbbc7ed58d265927f4ee97a7428f94fae1e.tar.xz c-stuff-e5784dbbc7ed58d265927f4ee97a7428f94fae1e.zip |
Merge branch 'master' of https://github.com/EliteTK/c-stuff
Conflicts:
xcb_gol_macro.c
-rw-r--r-- | xcb_gol_macro.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/xcb_gol_macro.c b/xcb_gol_macro.c index 2f8f2af..daab30b 100644 --- a/xcb_gol_macro.c +++ b/xcb_gol_macro.c @@ -61,12 +61,6 @@ void gol_random(Gol *const gol, unsigned const int seed) gol->buffers[gol->front][i] = rand() < 0.5 * ((double)RAND_MAX + 1.0); } -static uint32_t gol_clamp(const uint32_t pos, const uint32_t max) { - return pos < 0 ? pos + max : pos % max; -} - -static uint32_t gol_resolve_f(const Gol *const gol, - static uint8_t gol_neighbours(Gol *const gol, const uint32_t x, const uint32_t y) { uint8_t neighbours = 0; @@ -183,4 +177,3 @@ int main(int argc, char **argv) } return 0; } - |