mdb@silvlis.com (Mark D. Baushke) (10/15/88)
Index: gcc 1.30, SunOS 3.4, Sun 3/50
/usr/include/sundev/vuid_event.h
The fixincludes script modifies /usr/include/sundev/vuid_event.h
incorrectly.
The lines
#define SHIFT_LEFTCTRL (VKEY_FIRSTSHIFT+4) /* 32532 */
#define SHIFT_RIGHTCTRL (VKEY_FIRSTSHIFT+5) /* 32533 */
get changed to
#define SHIFT_LEFTCTRL (VKEY_FIRSTSHIFT+'4') /* 32532 */
#define SHIFT_RIGHTCTRL (VKEY_FIRSTSHIFT+'5') /* 32533 */
which gives incorrect values to SHIFT_LEFTCTRL and SHIFT_RIGHTCTRL.
The rest of the changes to the _IOW and _IOR values in that file are
correct.
The fixincludes script also finds a number of files such as:
/usr/include/stdio.h
/usr/include/mon/keyboard.h
/usr/include/sundev/arreg.h
/usr/include/sundev/kbd.h
/usr/include/sunwindow/win_input.h
/usr/include/X/Xkeyboard.h (from X 10.4)
for which no changes are needed or made.
I believe that fixincludes should be modified to do a cmp between the
/usr/include and gcc-include versions and delete from the gcc-include
tree any files that have not actually been modified. As well as clean
up the problem in sundev/vuid_event.h .
Suggested fix:
*** fixincludes-dist Fri Oct 14 11:59:06 1988
--- fixincludes Fri Oct 14 16:31:27 1988
***************
*** 30,35 ****
--- 30,40 ----
g/#define.CTRL/s/'c'/c/g
wq
EOF
+ if cmp $file ${LIB}/$file >/dev/null 2>&1; then
+ echo No fixes were made to $file.
+ echo Deleteing ${LIB}/$file
+ rm ${LIB}/$file
+ fi
fi
fi
done
***************
*** 48,56 ****
fi
if [ -r ${LIB}/sundev/vuid_event.h ]; then
! echo Fixing sundev/vuid_event.h comment
ex ${LIB}/sundev/vuid_event.h <<EOF
g/doesn't/s/doesn't/doesn''t/
wq
EOF
fi
--- 53,62 ----
fi
if [ -r ${LIB}/sundev/vuid_event.h ]; then
! echo Fixing sundev/vuid_event.h comment, SHIFT_LEFTCTRL, and SHIFT_RIGHTCTRL
ex ${LIB}/sundev/vuid_event.h <<EOF
g/doesn't/s/doesn't/doesn''t/
+ g/VKEY_FIRSTSHIFT+'/s/'\(.\)'/\1/
wq
EOF
fi
------------------------------------------------------------------------------
Mark D. Baushke Internet: mdb%silvlis.com@sun.com
Silvar-Lisco, Inc. Nameservers: mdb@silvlis.com
1080 Marsh Road Usenet: {pyramid,sun}!silvlis!mdb
Menlo Park, CA 94025-1053 Telephone: +1 415 853-6411 / +1 415 969-8328