summaryrefslogtreecommitdiff
path: root/src/Popup.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
commitb90c05162b5edd08338a060f5777419654fa6d2e (patch)
tree346b8c7439d7d8db30404ad9f4db4c4e1725c252 /src/Popup.c
parenta6bdd56c5b098599942e4091ae7e2af2d4631b44 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/Popup.c')
-rw-r--r--src/Popup.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Popup.c b/src/Popup.c
index 1549a68..b51151e 100644
--- a/src/Popup.c
+++ b/src/Popup.c
@@ -46,22 +46,15 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
+/* $XFree86: xc/lib/Xt/Popup.c,v 1.4 2003/10/24 15:47:35 tsi Exp $ */
#include "IntrinsicI.h"
#include "ShellP.h"
-#if NeedFunctionPrototypes
void _XtPopup(
Widget widget,
XtGrabKind grab_kind,
- _XtBoolean spring_loaded
- )
-#else
-void _XtPopup(widget, grab_kind, spring_loaded)
- Widget widget;
- XtGrabKind grab_kind;
- Boolean spring_loaded;
-#endif
+ _XtBoolean spring_loaded)
{
register ShellWidget shell_widget = (ShellWidget) widget;
@@ -93,13 +86,7 @@ void _XtPopup(widget, grab_kind, spring_loaded)
} /* _XtPopup */
-#if NeedFunctionPrototypes
void XtPopup (Widget widget, XtGrabKind grab_kind)
-#else
-void XtPopup (widget, grab_kind)
- Widget widget;
- XtGrabKind grab_kind;
-#endif
{
Widget hookobj;