Skip to content

Commit a7a2591

Browse files
committed
Corrections for Linux build with windows changes
Author: Author Name [email protected]
1 parent 81b2ff4 commit a7a2591

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

messages/make_message_src.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ cd ${BASENAME}
5454

5555
make_obj() {
5656
RETREAT="../../"
57+
MODE="static"
5758

5859
case $KERNEL_NAME in
5960
MINGW32_NT*)
@@ -63,6 +64,7 @@ make_obj() {
6364
echo "Changing directory"
6465
RETREAT="../../../../messages/"
6566
fi
67+
MODE="common"
6668
;;
6769
*)
6870
;;
@@ -81,7 +83,7 @@ make_obj() {
8183
cd work
8284
echo "dir: $(pwd)"
8385
ls *.res >packagelist.txt
84-
${PKGDATA} --verbose -p ${BASENAME} -m common -q packagelist.txt > /dev/null
86+
${PKGDATA} --verbose -p ${BASENAME} -m ${MODE} -q packagelist.txt > /dev/null
8587

8688

8789
case $KERNEL_NAME in
@@ -138,4 +140,4 @@ if [ -f "../$1" ]; then
138140
done
139141
else
140142
make_obj
141-
fi
143+
fi

src/crossbuild/compatibility.h

-4
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ extern "C" {
6464
#ifdef mingw_PLATFORM
6565
#include <unicode/umachine.h>
6666

67-
#ifndef COMPAT_UCHAR
68-
#define COMPAT_UCHAR UChar
69-
#endif
70-
7167
#ifndef SHARE_FLAG_DENYNO
7268
#define SHARE_FLAG_DENYNO _SH_DENYNO
7369
#endif

src/libltfs/ltfs.h

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ extern "C" {
6161
#include "arch/win/win_util.h"
6262
#include <time.h>
6363
#else
64-
#include <unistd.h>
6564
#include <sys/time.h>
6665
#include <sys/ipc.h>
6766
#include <sys/shm.h>

0 commit comments

Comments
 (0)