diff options
Diffstat (limited to 'winsup/w32api/lib')
| -rw-r--r-- | winsup/w32api/lib/Makefile.in | 13 | ||||
| -rw-r--r-- | winsup/w32api/lib/kernel32.def | 6 | ||||
| -rw-r--r-- | winsup/w32api/lib/shobjidl-uuid.c | 13 | ||||
| -rwxr-xr-x | winsup/w32api/lib/wtsapi32.def | 1 |
4 files changed, 6 insertions, 27 deletions
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index d918f680f..63a62e022 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -42,7 +42,7 @@ UUID_OBJS = \ objsafe-uuid.o oaidl-uuid.o docobj-uuid.o comcat-uuid.o \ exdisp-uuid.o mlang-uuid.o objidl-uuid.o cguid-uuid.o \ olectlid-uuid.o ativscp-uuid.o urlmon-uuid.o hlink-uuid.o \ - hlguids-uuid.o extras-uuid.o devguid.o power-uuid.o shobjidl-uuid.o + hlguids-uuid.o extras-uuid.o devguid.o power-uuid.o EXTRA_OBJS = \ shell32.o scrnsave.o scrnsavw.o largeint.o gdiplus.o \ @@ -54,7 +54,7 @@ UUID_SOURCES = \ objsafe-uuid.c oaidl-uuid.c docobj-uuid.c comcat-uuid.c \ exdisp-uuid.c mlang-uuid.c objidl-uuid.c cguid-uuid.c \ olectlid-uuid.c ativscp-uuid.c urlmon-uuid.c hlink-uuid.c \ - hlguids-uuid.c extras-uuid.c devguid.c power-uuid.c shobjidl-uuid.c + hlguids-uuid.c extras-uuid.c devguid.c power-uuid.c SOURCES = \ scrnsave.c shell32.c largeint.c gdiplus.c $(UUID_SOURCES) \ @@ -131,14 +131,7 @@ install-libraries: all $(need-DESTDIR-compatibility) install-headers: $(need-DESTDIR-compatibility) $(mkinstalldirs) $(DESTDIR)${inst_includedir} for file in $(HEADERS); do \ - case $$file in \ - amvideo.h | amaudio.h) \ - echo Not installing $$file \ - ;; \ - *) \ - $(INSTALL_DATA) ${top_srcdir}/include/$$file $(DESTDIR)${inst_includedir}; \ - ;; \ - esac \ + $(INSTALL_DATA) ${top_srcdir}/include/$$file $(DESTDIR)${inst_includedir}; \ done $(mkinstalldirs) $(DESTDIR)${inst_includedir}/GL for file in $(GL_HEADERS); do \ diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def index 177160f6b..fca559aac 100644 --- a/winsup/w32api/lib/kernel32.def +++ b/winsup/w32api/lib/kernel32.def @@ -749,11 +749,11 @@ InitializeSListHead@4 InitializeSRWLock@4 InterlockedCompareExchange64@20 InterlockedCompareExchange@12 -InterlockedDecrement -InterlockedExchange +InterlockedDecrement@4 +InterlockedExchange@8 InterlockedExchangeAdd@8 InterlockedFlushSList@4 -InterlockedIncrement +InterlockedIncrement@4 InterlockedPopEntrySList@4 InterlockedPushEntrySList@8 InvalidateConsoleDIBits@8 diff --git a/winsup/w32api/lib/shobjidl-uuid.c b/winsup/w32api/lib/shobjidl-uuid.c deleted file mode 100644 index 47712fbc5..000000000 --- a/winsup/w32api/lib/shobjidl-uuid.c +++ /dev/null @@ -1,13 +0,0 @@ -/* shobjidl-uuid.c */ -/* Generate GUIDs for Object IDL interfaces */ - -/* All CLSIDs defined in this file were extracted from - * HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\ */ - -/* All IIDs defined in this file were extracted from - * HKEY_CLASSES_ROOT\Interface\ */ - -#define INITGUID -#include <basetyps.h> -DEFINE_GUID(IID_ITaskbarList3,0xea1afb91,0x9e28,0x4b86,0x90,0xe9,0x9e,0x9f,0x8a,0x5e,0xef,0xaf); -DEFINE_GUID(CLSID_ITaskbarList,0x56FDF342L,0xFD6D,0x11d0,0x95,0x8A,0x00,0x60,0x97,0xC9,0xA0,0x90); diff --git a/winsup/w32api/lib/wtsapi32.def b/winsup/w32api/lib/wtsapi32.def index 6baaa7124..e02e4705c 100755 --- a/winsup/w32api/lib/wtsapi32.def +++ b/winsup/w32api/lib/wtsapi32.def @@ -27,7 +27,6 @@ WTSTerminateProcess@12 WTSUnRegisterSessionNotification@4 WTSVirtualChannelClose@4 WTSVirtualChannelOpen@12 -WTSVirtualChannelOpenEx@12 WTSVirtualChannelPurgeInput@4 WTSVirtualChannelPurgeOutput@4 WTSVirtualChannelQuery@16 |