diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-19 23:59:40 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-19 23:59:40 -0500 |
| commit | 3ae58f457bcdfa90b26dad4c9d192f045874ddae (patch) | |
| tree | 23d603a47cfedc8e51cf36bf3480f83118b94710 /render | |
| parent | 2b8b5da04b14af1639143cc332874c7e1a03a8bb (diff) | |
| parent | 4b41ac8343efa21a959d81a4db8aea32e5960f10 (diff) | |
Merge branch 'backport'
Diffstat (limited to 'render')
| -rw-r--r-- | render/instance.c | 4 | ||||
| -rw-r--r-- | render/obrender-3.0.pc.in | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/render/instance.c b/render/instance.c index 91f9db77..b867815c 100644 --- a/render/instance.c +++ b/render/instance.c @@ -91,7 +91,7 @@ RrInstance* RrInstanceNew (Display *display, gint screen) return definst; } -void RrTrueColorSetup (RrInstance *inst) +static void RrTrueColorSetup (RrInstance *inst) { gulong red_mask, green_mask, blue_mask; XImage *timage = NULL; @@ -121,7 +121,7 @@ void RrTrueColorSetup (RrInstance *inst) #define RrPseudoNcolors(inst) (1 << (inst->pseudo_bpc * 3)) -void RrPseudoColorSetup (RrInstance *inst) +static void RrPseudoColorSetup (RrInstance *inst) { XColor icolors[256]; gint tr, tg, tb, n, r, g, b, i, incolors, ii; diff --git a/render/obrender-3.0.pc.in b/render/obrender-3.0.pc.in index 68e54cb7..ebb17ef3 100644 --- a/render/obrender-3.0.pc.in +++ b/render/obrender-3.0.pc.in @@ -6,12 +6,9 @@ includedir=@includedir@ xcflags=@X_CFLAGS@ xlibs=@X_LIBS@ -pangocflags=@PANGO_CFLAGS@ -pangolibs=@PANGO_LIBS@ - Name: ObRender Description: Openbox Render Library Version: @VERSION@ Requires: obparser-3.0 glib-2.0 xft pangoxft -Libs: -L${libdir} -lobrender ${xlibs} ${pangolibs} -Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} ${pangocflags} +Libs: -L${libdir} -lobrender ${xlibs} +Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} |