diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-03-14 01:30:24 -0300 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-19 16:22:29 -0800 |
| commit | b6f793d7d5c7f7c55911e6524dede41b92dcbc22 (patch) | |
| tree | a048c9f15315c72ae8e157c83bba9c186a09c491 /src/Speedo/out_util.c | |
| parent | 282ac4226195d58e3818e7ac97093e396aa78086 (diff) | |
libXfont ansification and removal of xf86_ansic.h dependency
Basically the code is now compiled as if FONTMODULE was never defined,
but also removed some "magic" defining _XOPEN_SOURCE before including
math.h.
Also removed some #if 0'ed code instead of fixing prototypes inside
the "dead code".
Changes to spdo_prv.h were due to defines like:
<hash>define foo() sp_foo()
that would not compile with the ansification in the format:
type foo(void)
due to the macro receiving "void" as an argument.
Diffstat (limited to 'src/Speedo/out_util.c')
| -rw-r--r-- | src/Speedo/out_util.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/Speedo/out_util.c b/src/Speedo/out_util.c index baf9427..bf2b0ee 100644 --- a/src/Speedo/out_util.c +++ b/src/Speedo/out_util.c @@ -41,8 +41,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. #define ABS(X) ( (X < 0) ? -X : X) #if INCL_BLACK || INCL_2D || INCL_SCREEN -static FUNCTION void restart_intercepts_out(void) -GDECL +static FUNCTION void restart_intercepts_out(/** GDECL **/ void) /* Called by sp_make_char when a new sub character is started * Freezes current sorted lists */ @@ -206,8 +205,7 @@ printf("CURVE_OUT(%3.1f, %3.1f, %3.1f, %3.1f, %3.1f, %3.1f)\n", -FUNCTION void end_contour_out() -GDECL +FUNCTION void end_contour_out(/** GDECL **/ void) /* Called after the last vector in each contour */ { @@ -217,8 +215,7 @@ printf("END_CONTOUR_OUT()\n"); } -FUNCTION void end_sub_char_out() -GDECL +FUNCTION void end_sub_char_out(/** GDECL **/ void) /* Called after the last contour in each sub-character in a compound character */ { @@ -228,8 +225,7 @@ printf("END_SUB_CHAR_OUT()\n"); } -FUNCTION void init_intercepts_out() -GDECL +FUNCTION void init_intercepts_out(/** GDECL **/ void) /* Called to initialize intercept storage data structure */ @@ -308,8 +304,7 @@ sp_intercepts.inttype[sp_globals.no_y_lists-1] = END_INT; -FUNCTION void reduce_band_size_out() -GDECL +FUNCTION void reduce_band_size_out(/** GDECL **/ void) { sp_globals.y_band.band_min = sp_globals.y_band.band_max - ((sp_globals.y_band.band_max - sp_globals.y_band.band_min) >> 1); #if INCL_2D @@ -318,8 +313,7 @@ sp_globals.y_band.band_array_offset = sp_globals.y_band.band_min; } -FUNCTION boolean next_band_out() -GDECL +FUNCTION boolean next_band_out(/** GDECL **/ void) { fix15 tmpfix15; |