diff -ur Makefile /sw/src/malsync-2.1.1-1/malsync/Makefile
old
|
new
|
|
15 | 15 | endif |
16 | 16 | |
17 | 17 | TREETOP = . |
18 | | PILOT_LINK_DIR = $(TREETOP)/pilot-link-0.11.5 |
19 | 18 | |
20 | 19 | CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \ |
21 | | -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include \ |
| 20 | -I$(TREETOP)/mal/client/common -I$(PREFIX)/include \ |
22 | 21 | -I$(TREETOP)/mal/client/unix |
23 | 22 | |
24 | 23 | ifeq ($(PLAT),Darwin) |
… |
… |
|
73 | 72 | |
74 | 73 | $(TARGET): $(OBJS) |
75 | 74 | $(CC) $(DYNLINK) $(CFLAGS) -o $@ $(OBJS) \ |
76 | | -L${PILOT_LINK_DIR}/libpisock/.libs -lpisock $(LINKLIBS) |
| 75 | -L$(PREFIX)/lib -lpisock $(LINKLIBS) |
77 | 76 | clean: |
78 | 77 | rm -f $(OBJS) $(TARGET) |
79 | 78 | |
diff -ur mal/client/common/AGCommandProcessor.c /sw/src/malsync-2.1.1-1/malsync/mal/client/common/AGCommandProcessor.c
old
|
new
|
|
907 | 907 | case AG_DEVICEINFO_CMD: |
908 | 908 | case AG_NEWIDS_CMD: |
909 | 909 | default: |
910 | | #ifdef DEBUG_COMMANDS |
| 910 | #ifdef DEBUG_COMMANDS |
911 | 911 | printf("\tThe server should have NEVER sent a %s command.\n", name); |
912 | | #endif |
| 912 | #endif |
913 | 913 | rc = AGCLIENT_ERR; |
914 | 914 | break; |
915 | 915 | } |
diff -ur mal/common/AGBufferedNet.c /sw/src/malsync-2.1.1-1/malsync/mal/common/AGBufferedNet.c
old
|
new
|
|
26 | 26 | |
27 | 27 | #ifdef __unix__ |
28 | 28 | |
29 | | #include <errno.h> |
| 29 | #include <errno.h> |
30 | 30 | |
31 | 31 | #endif // __unix__ |
32 | 32 | |
33 | 33 | /*************************************************************************************/ |
34 | 34 | #ifdef __palmos__ |
35 | 35 | |
36 | | #define BUFSIZE 512 |
37 | | #define ALMOST_INFINITE_TIMEOUT (10 * sysTicksPerSecond) |
| 36 | #define BUFSIZE 512 |
| 37 | #define ALMOST_INFINITE_TIMEOUT (10 * sysTicksPerSecond) |
38 | 38 | |
39 | 39 | #else |
40 | 40 | |
41 | | #define BUFSIZE 4096 |
| 41 | #define BUFSIZE 4096 |
42 | 42 | |
43 | 43 | #endif |
44 | 44 | |
diff -ur mal/common/AGNet.c /sw/src/malsync-2.1.1-1/malsync/mal/common/AGNet.c
old
|
new
|
|
26 | 26 | //#include <stdio.h> (adam) temporary hack - comment out so it will build on ce |
27 | 27 | |
28 | 28 | #ifndef _WIN32 |
29 | | #include <ctype.h> //PENDING(klobad) not needed on palm or win remove?? |
| 29 | #include <ctype.h> |
| 30 | //PENDING(klobad) not needed on palm or win remove?? |
30 | 31 | #include <errno.h> |
31 | 32 | #endif |
32 | 33 | |
… |
… |
|
455 | 456 | case EINPROGRESS: |
456 | 457 | return AG_NET_WOULDBLOCK; |
457 | 458 | #ifdef _HPUX_SOURCE |
458 | | #ifndef DARWIN |
| 459 | #ifndef DARWIN |
459 | 460 | case EWOULDBLOCK: |
460 | | #endif |
| 461 | #endif |
461 | 462 | #endif |
462 | 463 | case EAGAIN: |
463 | 464 | return AG_NET_WOULDBLOCK; |