diff options
| author | bnewbold <bnewbold@robocracy.org> | 2010-05-26 23:39:10 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-05-26 23:39:10 -0400 |
| commit | dc8ecb7649d0a7caa51b17f7f05e98acc747bd76 (patch) | |
| tree | 0b4bb15e3b86622059966bf6cdd31d2e04921ded /wirish | |
| parent | c99212c5dea4d26f154731a90abd77e9ea70a917 (diff) | |
| parent | f30bc0ea864e8f3ae04f198b4a3d58b34cc5efd3 (diff) | |
| download | librambutan-dc8ecb7649d0a7caa51b17f7f05e98acc747bd76.tar.gz librambutan-dc8ecb7649d0a7caa51b17f7f05e98acc747bd76.zip | |
fastforward of master up the newboot, plus patch of math stuff
Conflicts: copy-to-ide, wirish/WProgram.h
Diffstat (limited to 'wirish')
| -rw-r--r-- | wirish/wirish.h | 1 | ||||
| -rw-r--r-- | wirish/wirish_math.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/wirish/wirish.h b/wirish/wirish.h index 5129c26..f54517a 100644 --- a/wirish/wirish.h +++ b/wirish/wirish.h @@ -38,6 +38,7 @@ #include "time.h" #include "pwm.h" #include "ext_interrupts.h" +#include "wirish_math.h" #ifdef __cplusplus extern "C"{ diff --git a/wirish/wirish_math.h b/wirish/wirish_math.h index 19f3892..8746d01 100644 --- a/wirish/wirish_math.h +++ b/wirish/wirish_math.h @@ -27,6 +27,8 @@ #include <math.h> +#ifdef __cplusplus + void randomSeed(unsigned int); long random(long); long random(long, long); @@ -54,3 +56,4 @@ long map(long, long, long, long, long); #endif +#endif |