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/set_trns.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/set_trns.c')
| -rw-r--r-- | src/Speedo/set_trns.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Speedo/set_trns.c b/src/Speedo/set_trns.c index 35c2e33..cda7175 100644 --- a/src/Speedo/set_trns.c +++ b/src/Speedo/set_trns.c @@ -74,8 +74,7 @@ static ufix8 FONTFAR *sp_setup_pix_table(PROTO_DECL2 ufix8 FONTFAR *pointer,bool static ufix8 FONTFAR *sp_setup_int_table(PROTO_DECL2 ufix8 FONTFAR *pointer,fix15 no_X_int_zones,fix15 no_Y_int_zones); -FUNCTION void init_tcb() -GDECL +FUNCTION void init_tcb(/** GDECL **/ void) /* * Called by sp_make_char() and make_comp_char() to initialize the current * transformation control block to the top level transformation. @@ -246,8 +245,7 @@ end_plaid_data(); return pointer; } -FUNCTION static void sp_constr_update() -GDECL +FUNCTION static void sp_constr_update(/** GDECL **/ void) /* * Called by plaid_tcb() to update the constraint table for the current * transformation. @@ -584,7 +582,7 @@ if ((sp_globals.pspecs->flags & SQUEEZE_BOTTOM) && sp_plaid.pix[end_edge] = em_bot_pix; } -FUNCTION boolean calculate_x_scale(x_factor, x_offset, no_X_ctrl_zones) +FUNCTION boolean calculate_x_scale( GDECL fix31 *x_factor, fix31 *x_offset, @@ -1199,8 +1197,7 @@ for (i = 0; i < n; i++) return pointer; } #if INCL_ISW -FUNCTION fix31 compute_isw_scale() -GDECL +FUNCTION fix31 compute_isw_scale(/** GDECL **/ void) { fix31 isw_scale; |