XmPrivate.h: Avoid whitespace problems (IMPROVED)

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.

diff --git a/cde/include/Xm/Imakefile b/cde/include/Xm/Imakefile
index 66268c0bf623d87b02d3656cd2051dd0fc0cd793..8d20cdc95e826f23d5829de232501fb932edd7cf 100644 (file)
--- a/cde/include/Xm/Imakefile
+++ b/cde/include/Xm/Imakefile
@@ -14,10 +14,9 @@ BuildIncludes($(HEADERS),Xm,..)
 
 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.
-#if !defined(LinuxArchitecture)
+
 XmPrivate.h: extractprototype.awk
        awk -f extractprototype.awk $(MLIBSRC)/Xm/$(ALLHEADERS) > $@ || rm -f $@
-#endif
 
 depend::
 

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

diff --git a/cde/include/Xm/extractprototype.awk b/cde/include/Xm/extractprototype.awk
index c45f7beea6c81257cd67fd3eced1471c415bb2ab..21011ce615b686d259b2e94886b8ef2967a1ea59 100644 (file)
--- a/cde/include/Xm/extractprototype.awk
+++ b/cde/include/Xm/extractprototype.awk
@@ -24,6 +24,7 @@ function proto() {
                                printf("/* Extracted from %s */\n", n);
                                curfile = FILENAME;
                        }
+                       sub(/[ \t]*$/, "", line);
                        print line;
                        getline;
                        if ( pattern == 0) {