Remove some C99 idioms and allow this package to be build on gcc2
architectures.
This commit is contained in:
parent
d89a9420a7
commit
dbd7ceaba3
@ -1,14 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.32 2007/10/15 21:55:53 mbalmer Exp $
|
||||
|
||||
NOT_FOR_ARCHS= vax
|
||||
# $OpenBSD: Makefile,v 1.33 2007/10/17 07:57:03 mbalmer Exp $
|
||||
|
||||
COMMENT-main= Motif toolkit
|
||||
COMMENT-demos= Motif toolkit demos
|
||||
|
||||
VERSION= 2.3.0
|
||||
DISTNAME= openmotif-${VERSION}
|
||||
PKGNAME-main= openmotif-${VERSION}
|
||||
PKGNAME-demos= openmotif-demos-${VERSION}p0
|
||||
PKGNAME-main= openmotif-${VERSION}p0
|
||||
PKGNAME-demos= openmotif-demos-${VERSION}p1
|
||||
|
||||
SHARED_LIBS= Mrm 4.0 \
|
||||
Uil 4.0 \
|
||||
|
19
x11/openmotif/patches/patch-lib_Xm_DataF_c
Normal file
19
x11/openmotif/patches/patch-lib_Xm_DataF_c
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-lib_Xm_DataF_c,v 1.1 2007/10/17 07:57:03 mbalmer Exp $
|
||||
--- lib/Xm/DataF.c.orig Tue Oct 16 10:11:27 2007
|
||||
+++ lib/Xm/DataF.c Tue Oct 16 10:12:05 2007
|
||||
@@ -10604,6 +10604,7 @@ df_SetValues(
|
||||
XmTextPosition new_position = 0;
|
||||
XmTextPosition newInsert;
|
||||
int n = 0;
|
||||
+ unsigned long blink_rate;
|
||||
|
||||
if (new_w->core.being_destroyed) return False;
|
||||
|
||||
@@ -10925,7 +10926,6 @@ df_SetValues(
|
||||
}
|
||||
|
||||
#ifdef XSETTINS_ON
|
||||
- unsigned long blink_rate;
|
||||
blink_rate = (unsigned long) Blink_rate_xsetting(new_tf);
|
||||
|
||||
if (XmTextF_has_focus(new_tf) && XtIsSensitive((Widget)new_tf) &&
|
19
x11/openmotif/patches/patch-lib_Xm_TextF_c
Normal file
19
x11/openmotif/patches/patch-lib_Xm_TextF_c
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-lib_Xm_TextF_c,v 1.1 2007/10/17 07:57:03 mbalmer Exp $
|
||||
--- lib/Xm/TextF.c.orig Tue Oct 16 08:33:28 2007
|
||||
+++ lib/Xm/TextF.c Mon Oct 15 23:27:45 2007
|
||||
@@ -8092,6 +8092,7 @@ SetValues(Widget old,
|
||||
XmTextPosition new_position = 0;
|
||||
XmTextPosition newInsert;
|
||||
int n = 0;
|
||||
+ unsigned long blink_rate;
|
||||
|
||||
if (new_w->core.being_destroyed) return False;
|
||||
TextFieldResetIC(old);
|
||||
@@ -8357,7 +8358,6 @@ SetValues(Widget old,
|
||||
}
|
||||
|
||||
#ifdef XSETTINS_ON
|
||||
- unsigned long blink_rate;
|
||||
blink_rate = (unsigned long) BlinkRate_xsetting(new_tf);
|
||||
if (new_tf->text.has_focus && XtIsSensitive((Widget)new_tf) &&
|
||||
blink_rate!= BlinkRate_xsetting(old_tf)) {
|
14
x11/openmotif/patches/patch-lib_Xm_xsettings_c
Normal file
14
x11/openmotif/patches/patch-lib_Xm_xsettings_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-lib_Xm_xsettings_c,v 1.1 2007/10/17 07:57:03 mbalmer Exp $
|
||||
--- lib/Xm/xsettings.c.orig Tue Oct 16 08:28:15 2007
|
||||
+++ lib/Xm/xsettings.c Tue Oct 16 08:31:43 2007
|
||||
@@ -520,8 +520,9 @@ xsettings_client_get_setting (XSettingsClient *clien
|
||||
const char *name,
|
||||
XSettingsSetting **setting)
|
||||
{
|
||||
+ XSettingsSetting *search;
|
||||
read_settings(client);
|
||||
- XSettingsSetting *search = xsettings_list_lookup (client->settings, name);
|
||||
+ search = xsettings_list_lookup (client->settings, name);
|
||||
if (search)
|
||||
{
|
||||
*setting = xsettings_setting_copy (search);
|
Loading…
Reference in New Issue
Block a user