aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2017-05-18 19:01:01 +0100
committerSimon Tatham <anakin@pobox.com>2017-05-18 19:01:01 +0100
commitf501b2927d7e4bf6b26c1e348270e6f4a48ffb27 (patch)
tree455e3d1fc69e45a06953a787bbf23b8ffabb7fab
parent5e1f0d7e9fb3b05c5867c57c9dfee0363441feae (diff)
downloadwix-on-linux-f501b2927d7e4bf6b26c1e348270e6f4a48ffb27.tar.gz
wix-on-linux-f501b2927d7e4bf6b26c1e348270e6f4a48ffb27.tar.bz2
wix-on-linux-f501b2927d7e4bf6b26c1e348270e6f4a48ffb27.zip
Rename the last 'fake' file.
-rw-r--r--Makefile.am5
-rw-r--r--winterop-stubs.c (renamed from fake-winterop.c)14
2 files changed, 3 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index c40bb2e..f2695f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,9 @@ ACLOCAL_AMFLAGS = -I m4
4 4
5lib_LTLIBRARIES = libwinterop.la libmsi.la libpreload.la 5lib_LTLIBRARIES = libwinterop.la libmsi.la libpreload.la
6 6
7libwinterop_la_SOURCES = fake-winterop.c makecab.c readcab.c memory.c \ 7libwinterop_la_SOURCES = makecab.c readcab.c winterop-stubs.c \
8memory.h dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h 8memory.c memory.h dupstr.c dupstr.h subproc.c subproc.h uchars.c \
9uchars.h
9 10
10libmsi_la_SOURCES = makemsi.c md5.c memory.c memory.h version.c \ 11libmsi_la_SOURCES = makemsi.c md5.c memory.c memory.h version.c \
11dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h 12dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h
diff --git a/fake-winterop.c b/winterop-stubs.c
index 70261e2..38792c5 100644
--- a/fake-winterop.c
+++ b/winterop-stubs.c
@@ -1,21 +1,7 @@
1#include <stdio.h>
2#include <stdlib.h>
3#include <stdint.h> 1#include <stdint.h>
4#include <stdbool.h>
5#include <stdarg.h>
6#include <string.h>
7#include <uchar.h> 2#include <uchar.h>
8#include <err.h> 3#include <err.h>
9 4
10#include <sys/types.h>
11#include <sys/wait.h>
12#include <unistd.h>
13
14#include "memory.h"
15#include "dupstr.h"
16#include "subproc.h"
17#include "uchars.h"
18
19uint32_t HashPublicKeyInfo(void *pCertContext, 5uint32_t HashPublicKeyInfo(void *pCertContext,
20 void *rgbSubjectKeyIdentifier, 6 void *rgbSubjectKeyIdentifier,
21 uint32_t *pcbSubjectKeyIndentifier) 7 uint32_t *pcbSubjectKeyIndentifier)