external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

XmPrivate.h: Avoid whitespace problems (IMPROVED)

Browse source 
When applying a patch, "git am" strips
trailing whitespace, although they are
present in the git formatted-patch.

This way the committed file will be
slightly different than the file re-generated
by extractprototype.h

It shouldn't hurt, but next run of
extractprototype.h will add trailing spaces
again and the resulting diff on XmPrivate.h
will include more changes than actually
needed.

This may break some viscious circle after
applying the patch, so enabling regeneration
on LinuxArchitecture again.

This patch does not add XmeFlushIconFileCache()
needed by dtcreate.
This commit is contained in:
Marcin Cieslak 2012-09-29 22:23:33 +02:00 • committed by Jon Trulson
parent 71962e580d
commit 3eaeffaf7e
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cde/include/Xm/Imakefile
View file

@ -14,10 +14,9 @@ BuildIncludes($(HEADERS),Xm,..)
XCOMM We do not build with Motif sources on Linux, so this will never XCOMM We do not build with Motif sources on Linux, so this will never
XCOMM do the right thing on that platform. Just leave XmPrivate.h as-is. XCOMM do the right thing on that platform. Just leave XmPrivate.h as-is.
#if !defined(LinuxArchitecture)
XmPrivate.h: extractprototype.awk XmPrivate.h: extractprototype.awk
awk -f extractprototype.awk $(MLIBSRC)/Xm/$(ALLHEADERS) > $@ || rm -f $@ awk -f extractprototype.awk $(MLIBSRC)/Xm/$(ALLHEADERS) > $@ || rm -f $@
#endif
depend:: depend::

32
cde/include/Xm/XmPrivate.h
View file

@ -10,7 +10,7 @@
extern "C" { extern "C" {
#endif #endif
/* Extracted from BaseClassI.h */ /* Extracted from BaseClassI.h */
extern void _XmPushWidgetExtData( extern void _XmPushWidgetExtData(
Widget widget, Widget widget,
XmWidgetExtData data, XmWidgetExtData data,
#if NeedWidePrototypes #if NeedWidePrototypes
@ -18,7 +18,7 @@ extern void _XmPushWidgetExtData(
#else #else
unsigned char extType) ; unsigned char extType) ;
#endif /* NeedWidePrototypes */ #endif /* NeedWidePrototypes */
extern void _XmPopWidgetExtData( extern void _XmPopWidgetExtData(
Widget widget, Widget widget,
XmWidgetExtData *dataRtn, XmWidgetExtData *dataRtn,
#if NeedWidePrototypes #if NeedWidePrototypes
@ -34,7 +34,7 @@ extern XmWidgetExtData _XmGetWidgetExtData(
unsigned char extType) ; unsigned char extType) ;
#endif /* NeedWidePrototypes */ #endif /* NeedWidePrototypes */
/* Extracted from MenuStateI.h */ /* Extracted from MenuStateI.h */
extern void _XmSetInDragMode( extern void _XmSetInDragMode(
Widget widget, Widget widget,
#if NeedWidePrototypes #if NeedWidePrototypes
int mode) ; int mode) ;
@ -42,7 +42,7 @@ extern void _XmSetInDragMode(
Boolean mode) ; Boolean mode) ;
#endif /* NeedWidePrototypes */ #endif /* NeedWidePrototypes */
/* Extracted from MenuUtilI.h */ /* Extracted from MenuUtilI.h */
extern int _XmGrabPointer( extern int _XmGrabPointer(
Widget widget, Widget widget,
int owner_events, int owner_events,
unsigned int event_mask, unsigned int event_mask,
@ -56,11 +56,11 @@ extern void _XmGetActiveTopLevelMenu(
Widget wid, Widget wid,
Widget *rwid); Widget *rwid);
/* Extracted from SyntheticI.h */ /* Extracted from SyntheticI.h */
extern void _XmExtGetValuesHook( extern void _XmExtGetValuesHook(
Widget w, Widget w,
ArgList args, ArgList args,
Cardinal *num_args) ; Cardinal *num_args) ;
extern void _XmGadgetImportSecondaryArgs( extern void _XmGadgetImportSecondaryArgs(
Widget w, Widget w,
ArgList args, ArgList args,
Cardinal *num_args) ; Cardinal *num_args) ;
@ -79,36 +79,36 @@ extern char * _XmStringSourceGetString(XmTextWidget tw,
Boolean want_wchar); Boolean want_wchar);
#endif /* NeedWidePrototypes */ #endif /* NeedWidePrototypes */
/* Extracted from TravActI.h */ /* Extracted from TravActI.h */
extern void _XmEnterGadget( extern void _XmEnterGadget(
Widget wid, Widget wid,
XEvent *event, XEvent *event,
String *params, String *params,
Cardinal *num_params) ; Cardinal *num_params) ;
extern void _XmLeaveGadget( extern void _XmLeaveGadget(
Widget wid, Widget wid,
XEvent *event, XEvent *event,
String *params, String *params,
Cardinal *num_params) ; Cardinal *num_params) ;
extern void _XmFocusInGadget( extern void _XmFocusInGadget(
Widget wid, Widget wid,
XEvent *event, XEvent *event,
String *params, String *params,
Cardinal *num_params) ; Cardinal *num_params) ;
extern void _XmFocusOutGadget( extern void _XmFocusOutGadget(
Widget wid, Widget wid,
XEvent *event, XEvent *event,
String *params, String *params,
Cardinal *num_params) ; Cardinal *num_params) ;
/* Extracted from TraversalI.h */ /* Extracted from TraversalI.h */
extern Boolean _XmFocusIsHere( extern Boolean _XmFocusIsHere(
Widget w) ; Widget w) ;
extern Boolean _XmShellIsExclusive( extern Boolean _XmShellIsExclusive(
Widget wid) ; Widget wid) ;
/* Extracted from UniqueEvnI.h */ /* Extracted from UniqueEvnI.h */
extern Boolean _XmIsEventUnique(XEvent *event) ; extern Boolean _XmIsEventUnique(XEvent *event) ;
extern void _XmRecordEvent(XEvent *event) ; extern void _XmRecordEvent(XEvent *event) ;
/* Extracted from VendorSI.h */ /* Extracted from VendorSI.h */
extern void _XmAddGrab( extern void _XmAddGrab(
Widget wid, Widget wid,
#if NeedWidePrototypes #if NeedWidePrototypes
int exclusive, int exclusive,
@ -117,15 +117,15 @@ extern void _XmAddGrab(
Boolean exclusive, Boolean exclusive,
Boolean spring_loaded) ; Boolean spring_loaded) ;
#endif /* NeedWidePrototypes */ #endif /* NeedWidePrototypes */
extern void _XmRemoveGrab( extern void _XmRemoveGrab(
Widget wid) ; Widget wid) ;
/* Extracted from XmI.h */ /* Extracted from XmI.h */
extern void _XmSocorro( extern void _XmSocorro(
Widget w, Widget w,
XEvent *event, XEvent *event,
String *params, String *params,
Cardinal *num_params) ; Cardinal *num_params) ;
extern void _XmClearShadowType( extern void _XmClearShadowType(
Widget w, Widget w,
#if NeedWidePrototypes #if NeedWidePrototypes
int old_width, int old_width,

1
cde/include/Xm/extractprototype.awk
View file

@ -24,6 +24,7 @@ function proto() {
printf("/* Extracted from %s */\n", n); printf("/* Extracted from %s */\n", n);
curfile = FILENAME; curfile = FILENAME;
} }
sub(/[ \t]*$/, "", line);
print line; print line;
getline; getline;
if ( pattern == 0) { if ( pattern == 0) {