Gentoo Attachment #23896 for bug #37812

View | Details | Raw Unified
Collapse All | Expand All

(-) svgalib-1.9.17/include/vga.h (+2 lines)

Lines 538-544	Link Here

#define ROP_COPY			0	/* Straight copy. */

#define ROP_COPY			0	/* Straight copy. */

#define ROP_OR				1	/* Source OR destination. */

#define ROP_OR				1	/* Source OR destination. */

#define ROP_AND				2	/* Source AND destination. */

#define ROP_AND				2	/* Source AND destination. */

#ifndef ROP_XOR

#define ROP_XOR				3	/* Source XOR destination. */

#define ROP_XOR				3	/* Source XOR destination. */

#endif

#define ROP_INVERT			4	/* Invert destination. */

#define ROP_INVERT			4	/* Invert destination. */

/* For the poly funcs */

/* For the poly funcs */

(-) svgalib-1.9.17/src/drivers/ali.c (-1 / +1 lines)

Lines 186-192	Link Here

static int ali_modeavailable(int mode)

static int ali_modeavailable(int mode)

    const unsigned char *regs;

    const unsigned char *regs;

    struct info *info;

    struct vgainfo *info;

    regs = LOOKUPMODE(ali_modes, mode);

    regs = LOOKUPMODE(ali_modes, mode);

    if (regs == NULL || mode == GPLANE16) {

    if (regs == NULL || mode == GPLANE16) {

(-) svgalib-1.9.17/src/drivers/apm.c (-1 / +1 lines)

Lines 193-199	Link Here

static int apm_modeavailable(int mode)

static int apm_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/ark.c (-1 / +1 lines)

Lines 154-160	Link Here

static int ark_modeavailable(int mode)

static int ark_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

(-) svgalib-1.9.17/src/drivers/banshee.c (-1 / +1 lines)

Lines 134-140	Link Here

static int banshee_modeavailable(int mode)

static int banshee_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/chips.c (-1 / +1 lines)

Lines 1035-1041	Link Here

/*----------------------------------------------------------------------*/

/*----------------------------------------------------------------------*/

static int CHIPS_modeavailable(int mode)

static int CHIPS_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/cirrus.c (-1 / +1 lines)

Lines 387-393	Link Here

static int cirrus_modeavailable(int mode)

static int cirrus_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/et3000.c (-1 / +1 lines)

Lines 151-157	Link Here

static int et3000_modeavailable(int mode)

static int et3000_modeavailable(int mode)

    const unsigned char *regs;

    const unsigned char *regs;

    struct info *info;

    struct vgainfo *info;

    regs = LOOKUPMODE(et3000_modes, mode);

    regs = LOOKUPMODE(et3000_modes, mode);

    if (regs == NULL || mode == GPLANE16)

    if (regs == NULL || mode == GPLANE16)

(-) svgalib-1.9.17/src/drivers/et4000.c (-1 / +1 lines)

Lines 561-567	Link Here

static int et4000_modeavailable(int mode)

static int et4000_modeavailable(int mode)

    const unsigned char *regs;

    const unsigned char *regs;

    struct info *info;

    struct vgainfo *info;

    regs = LOOKUPMODE(et4000_modes, mode);

    regs = LOOKUPMODE(et4000_modes, mode);

    if (regs == NULL || mode == GPLANE16)

    if (regs == NULL || mode == GPLANE16)

(-) svgalib-1.9.17/src/drivers/et6000.c (-1 / +1 lines)

Lines 708-714	Link Here

static int  et6000_modeavailable(int mode)

static int  et6000_modeavailable(int mode)

  int rtn;

  int rtn;

  struct info *info;

  struct vgainfo *info;

  ModeTiming *modetiming;

  ModeTiming *modetiming;

  ModeInfo *modeinfo;

  ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/g400.c (-1 / +1 lines)

Lines 198-204	Link Here

static int g400_modeavailable(int mode)

static int g400_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/g450c2.c (-1 / +1 lines)

Lines 153-159	Link Here

static int modeavailable(int mode)

static int modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/i740.c (-1 / +1 lines)

Lines 284-290	Link Here

static int i740_modeavailable(int mode)

static int i740_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/i810.c (-1 / +1 lines)

Lines 270-276	Link Here

static int modeavailable(int mode)

static int modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/laguna.c (-1 / +1 lines)

Lines 184-190	Link Here

static int laguna_modeavailable(int mode)

static int laguna_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/mach32.c (-5 / +5 lines)

Lines 1837-1843	Link Here

    return 0;

    return 0;

static inline int col2msk(struct info *iptr)

static inline int col2msk(struct vgainfo *iptr)

    switch (iptr->colors) {

    switch (iptr->colors) {

    case 1 << 24:

    case 1 << 24:

Lines 1864-1875	Link Here

    return 0;

    return 0;

static inline int col2bypp(struct info *iptr)

static inline int col2bypp(struct vgainfo *iptr)

    return iptr->bytesperpixel;

    return iptr->bytesperpixel;

static int mach32_log2(struct info *iptr)

static int mach32_log2(struct vgainfo *iptr)

    int res = -1, n = iptr->colors;

    int res = -1, n = iptr->colors;

Lines 1885-1891	Link Here

static void mach32_modfill(const mode_entry * mode, int modemask, int forcein)

static void mach32_modfill(const mode_entry * mode, int modemask, int forcein)

    register int i;

    register int i;

    register struct info *iptr;

    register struct vgainfo *iptr;

    register unsigned wid, hei;

    register unsigned wid, hei;

    float horz, vert, n_horz, n_vert, cmpvert;

    float horz, vert, n_horz, n_vert, cmpvert;

Lines 3061-3067	Link Here

static char *

static char *

 colstr(struct info *mode)

 colstr(struct vgainfo *mode)

    static char str[4];

    static char str[4];

    if (mode->colors <= 256) {

    if (mode->colors <= 256) {

(-) svgalib-1.9.17/src/drivers/millennium.c (-1 / +1 lines)

Lines 628-634	Link Here

static int mil_modeavailable(int mode)

static int mil_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/mx.c (-1 / +1 lines)

Lines 181-187	Link Here

static int mx_modeavailable(int mode)

static int mx_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/neo.c (-1 / +1 lines)

Lines 442-448	Link Here

static int neo_modeavailable(int mode)

static int neo_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/nv3.c (-1 / +1 lines)

Lines 152-158	Link Here

static int nv3_modeavailable(int mode)

static int nv3_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/oak.c (-1 / +1 lines)

Lines 275-281	Link Here

static int oak_modeavailable(int mode)

static int oak_modeavailable(int mode)

    const unsigned char *regs;

    const unsigned char *regs;

    struct info *info;

    struct vgainfo *info;

    regs = LOOKUPMODE(oak_modes, mode);

    regs = LOOKUPMODE(oak_modes, mode);

    if (regs == NULL || mode == GPLANE16) {

    if (regs == NULL || mode == GPLANE16) {

(-) svgalib-1.9.17/src/drivers/paradise.c (-1 / +1 lines)

Lines 224-230	Link Here

static int paradise_modeavailable(int mode)

static int paradise_modeavailable(int mode)

    const unsigned char *regs;

    const unsigned char *regs;

    struct info *info;

    struct vgainfo *info;

#ifdef DEBUG

#ifdef DEBUG

 fprintf(stderr,"paradise_modeavailable\n");

 fprintf(stderr,"paradise_modeavailable\n");

#endif

#endif

(-) svgalib-1.9.17/src/drivers/pm2.c (-1 / +1 lines)

Lines 214-220	Link Here

static int modeavailable(int mode)

static int modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/r128.c (-1 / +1 lines)

Lines 1024-1030	Link Here

static int r128_modeavailable(int mode)

static int r128_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/rage.c (-1 / +1 lines)

Lines 611-617	Link Here

static int rage_modeavailable(int mode)

static int rage_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/rendition.c (-1 / +1 lines)

Lines 142-148	Link Here

static int modeavailable(int mode)

static int modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/s3.c (-1 / +1 lines)

Lines 484-490	Link Here

static int s3_modeavailable(int mode)

static int s3_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

(-) svgalib-1.9.17/src/drivers/savage.c (-1 / +1 lines)

Lines 415-421	Link Here

static int modeavailable(int mode)

static int modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/sis.c (-1 / +1 lines)

Lines 212-218	Link Here

static int sis_modeavailable(int mode)

static int sis_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/skeleton.h (-1 / +1 lines)

Lines 80-86	Link Here

static int modeavailable(int mode)

static int modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/trident.c (-1 / +1 lines)

Lines 290-296	Link Here

static int modeavailable(int mode)

static int modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/drivers/tvga8900.c (-1 / +1 lines)

Lines 498-504	Link Here

static int tvga8900_modeavailable(int mode)

static int tvga8900_modeavailable(int mode)

    const unsigned char *regs;

    const unsigned char *regs;

    struct info *info;

    struct vgainfo *info;

    regs = LOOKUPMODE(tvga_modes, mode);

    regs = LOOKUPMODE(tvga_modes, mode);

    if (regs == NULL || mode == GPLANE16)

    if (regs == NULL || mode == GPLANE16)

(-) svgalib-1.9.17/src/drivers/vesa.c (-1 / +1 lines)

Lines 139-145	Link Here

static int vesa_modeavailable(int mode)

static int vesa_modeavailable(int mode)

    struct info *info;

    struct vgainfo *info;

    ModeTiming *modetiming;

    ModeTiming *modetiming;

    ModeInfo *modeinfo;

    ModeInfo *modeinfo;

(-) svgalib-1.9.17/src/libvga.h (-3 / +7 lines)

Lines 103-109	Link Here

#define GPLANE16   G640x350x16

#define GPLANE16   G640x350x16

/* graphics mode information */

/* graphics mode information */

struct info {

//fixing kernel 2.6 header compile problem

//what the fuck is wrong with this shit

// can't beliveve this

struct vgainfo {

    int xdim;

    int xdim;

    int ydim;

    int ydim;

    int colors;

    int colors;

Lines 127-136	Link Here

extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;

extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;

extern unsigned long __svgalib_linear_mem_base, __svgalib_linear_mem_size;

extern unsigned long __svgalib_linear_mem_base, __svgalib_linear_mem_size;

extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;

extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;

extern struct info CI;		/* current video parameters */

extern struct vgainfo CI;		/* current video parameters */

extern int COL;			/* current color            */

extern int COL;			/* current color            */

extern int CM;			/* current video mode       */

extern int CM;			/* current video mode       */

extern struct info infotable[];

extern struct vgainfo infotable[];

extern int SCREENON;		/* screen visible if != 0 */

extern int SCREENON;		/* screen visible if != 0 */

extern unsigned long __svgalib_graph_base;

extern unsigned long __svgalib_graph_base;

extern unsigned char *GM;	/* graphics memory frame */

extern unsigned char *GM;	/* graphics memory frame */

(-) svgalib-1.9.17/src/vga.c (-3 / +3 lines)

Lines 87-93	Link Here

/* If == 0 then nothing is defined by the user... */

/* If == 0 then nothing is defined by the user... */

int __svgalib_default_mode = 10;

int __svgalib_default_mode = 10;

struct info infotable[] =

struct vgainfo infotable[] =

    {80, 25, 16, 160, 0},	/* VGAlib VGA modes */

    {80, 25, 16, 160, 0},	/* VGAlib VGA modes */

    {320, 200, 16, 40, 0},

    {320, 200, 16, 40, 0},

Lines 280-286	Link Here

    {0, 0, 0, 0, 0}

    {0, 0, 0, 0, 0}

};

};

#define MAX_MODES (sizeof(infotable) / sizeof(struct info))

#define MAX_MODES (sizeof(infotable) / sizeof(struct vgainfo))

void (*__svgalib_go_to_background) (void) = 0;

void (*__svgalib_go_to_background) (void) = 0;

void (*__svgalib_come_from_background) (void) = 0;

void (*__svgalib_come_from_background) (void) = 0;

Lines 372-378	Link Here

static int flip_mode = TEXT;	/* flipped video mode       */

static int flip_mode = TEXT;	/* flipped video mode       */

int CM = TEXT;			/* current video mode       */

int CM = TEXT;			/* current video mode       */

struct info CI;			/* current video parameters */

struct vgainfo CI;			/* current video parameters */

int COL;			/* current color            */

int COL;			/* current color            */

static int initialized = 0;	/* flag: initialize() called ?  */

static int initialized = 0;	/* flag: initialize() called ?  */

(-) svgalib-1.9.17/src/vga.h (+2 lines)

Lines 538-544	Link Here

#define ROP_COPY			0	/* Straight copy. */

#define ROP_COPY			0	/* Straight copy. */

#define ROP_OR				1	/* Source OR destination. */

#define ROP_OR				1	/* Source OR destination. */

#define ROP_AND				2	/* Source AND destination. */

#define ROP_AND				2	/* Source AND destination. */

#ifndef ROP_XOR

#define ROP_XOR				3	/* Source XOR destination. */

#define ROP_XOR				3	/* Source XOR destination. */

#endif

#define ROP_INVERT			4	/* Invert destination. */

#define ROP_INVERT			4	/* Invert destination. */

/* For the poly funcs */

/* For the poly funcs */

(-) svgalib-1.9.17/svpmi/svpmi.c (-1 / +1 lines)

Lines 62-68	Link Here

static int

static int

svpmi_modeavailable (int mode)

svpmi_modeavailable (int mode)

  struct info *info;

  struct vgainfo *info;

  svpmi_modeentry *sm;

  svpmi_modeentry *sm;

  if (mode < 10)

  if (mode < 10)

Attachment #23896: Fixes the compile problem "redefinition.." whith installed linux-headers-2.6 for bug #37812