Commit 06e5c905 authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

fix bad merge

parent 12e9abcf
......@@ -53,14 +53,6 @@ extern int _Xmbstoutf8(
int len
);
extern int _Xmbstoutf8(
#if NeedFunctionPrototypes
char *ustr,
const char *str,
int len
#endif
);
/*
* Parsing File Format:
*
......
......@@ -55,17 +55,6 @@ from The Open Group.
#include "Xlibint.h"
#include "Xlcint.h"
#if NeedFunctionPrototypes
void
XmbDrawText(
Display *dpy,
Drawable d,
GC gc,
int x,
int y,
XmbTextItem *text_items,
int nitems)
#else
void
XmbDrawText(
Display *dpy,
......
......@@ -56,17 +56,6 @@ from The Open Group.
#include "Xlibint.h"
#include "Xlcint.h"
#if NeedFunctionPrototypes
void
XwcDrawText(
Display *dpy,
Drawable d,
GC gc,
int x,
int y,
XwcTextItem *text_items,
int nitems)
#else
void
XwcDrawText(
Display *dpy,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment