diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
| commit | b90c05162b5edd08338a060f5777419654fa6d2e (patch) | |
| tree | 346b8c7439d7d8db30404ad9f4db4c4e1725c252 /src/Converters.c | |
| parent | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/Converters.c')
| -rw-r--r-- | src/Converters.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/Converters.c b/src/Converters.c index 95a88e0..801279a 100644 --- a/src/Converters.c +++ b/src/Converters.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Converters.c,v 3.13 2002/06/03 20:59:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Converters.c,v 3.15 2003/05/27 22:26:42 tsi Exp $ */ /* @@ -171,17 +171,11 @@ void _XtConvertInitialize() return True; \ } -#if NeedFunctionPrototypes void XtDisplayStringConversionWarning( Display* dpy, _Xconst char* from, _Xconst char* toType ) -#else -void XtDisplayStringConversionWarning(dpy, from, toType) - Display* dpy; - String from, toType; -#endif { #ifndef NO_MIT_HACKS /* Allow suppression of conversion warnings. %%% Not specified. */ @@ -238,15 +232,10 @@ void XtDisplayStringConversionWarning(dpy, from, toType) UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtStringConversionWarning( _Xconst char* from, _Xconst char* toType ) -#else -void XtStringConversionWarning(from, toType) - String from, toType; -#endif { String params[2]; Cardinal num_params = 2; @@ -1645,7 +1634,7 @@ Boolean XtCvtStringToCommandArgArray(dpy, args, num_args, fromVal, toVal, XtPointer *closure_ret; { String *strarray, *ptr; - char *src, *src_str; + char *src; char *dst, *dst_str; char *start; int tokens, len; @@ -1656,7 +1645,7 @@ Boolean XtCvtStringToCommandArgArray(dpy, args, num_args, fromVal, toVal, "String to CommandArgArray conversion needs no extra arguments", (String *)NULL, (Cardinal *)NULL); - src = src_str = fromVal->addr; + src = fromVal->addr; dst = dst_str = __XtMalloc((unsigned) strlen(src) + 1); tokens = 0; |