Merge branch 'master' into lightpen

This commit is contained in:
Greg King
2013-07-01 09:25:02 -04:00
40 changed files with 151 additions and 136 deletions

View File

@@ -28,7 +28,7 @@
#define divfp(_a,_b) ((((signed long)_a)<<fpshift)/(_b))
/* Workaround missing clock stuff */
#if defined(__APPLE2__) || defined(__APPLE2ENH__)
#ifdef __APPLE2__
# define clock() 0
# define CLK_TCK 1
#endif

View File

@@ -57,7 +57,7 @@ void log (char *msg)
/* In a real-world overlay program one would probably not use a #pragma but
* rather place the all the code of certain source files into the overlay by
* rather place all the code of certain source files into the overlay by
* compiling them with --code-name OVERLAY1.
*/
#pragma code-name (push, "OVERLAY1");

View File

@@ -33,7 +33,7 @@ void log (char *msg)
/* In a real-world overlay program one would probably not use a #pragma but
* rather place the all the code of certain source files into the overlay by
* rather place all the code of certain source files into the overlay by
* compiling them with --code-name OVERLAY1.
*/
#pragma code-name (push, "OVERLAY1");

View File

@@ -12,7 +12,7 @@
/* Workaround missing clock stuff */
#if defined(__APPLE2__) || defined(__APPLE2ENH__)
#ifdef __APPLE2__
# define clock() 0
# define CLOCKS_PER_SEC 1
#endif