Accept SAN 1.0 pacakge (only wbxml is supported)

Linker script is updated to expose the newly used API.

6 files changed, 137 insertions, 3 deletions

diff --git a/configure.in b/configure.in
index 23a78b1..7febe48 100644
--- a/configure.in
+++ b/configure.in
@@ -161,8 +161,8 @@ AM_CONDITIONAL([COND_STATIC], [test "$enable_shared" = "no"])
 
 # Disable unconditionally at the moment. Would add dependency of SDK
 # on SyncML Toolkit.
-AC_DEFINE(WITHOUT_SAN_1_1, 1,
-          [support for Server Alerted Notifications according to SyncML 1.1])
+#AC_DEFINE(WITHOUT_SAN_1_1, 1,
+#          [support for Server Alerted Notifications according to SyncML 1.1])
 
 AC_CONFIG_FILES(Makefile src/Makefile synthesis.pc synthesis-sdk.pc)
 AC_OUTPUT
diff --git a/src/Makefile.am.in b/src/Makefile.am.in
index 0a8afe6..fd6bac0 100644
--- a/src/Makefile.am.in
+++ b/src/Makefile.am.in
@@ -116,8 +116,16 @@ libsynthesissdk_la_SOURCES += @LIBSYNTHESISSDK_SOURCES_BOTH@
 endif
 libsynthesissdk_la_CPPFLAGS = \
 	-D_GNU_SOURCE=1 \
+	-include $(top_builddir)/config.h \
+	-I$(srcdir)/Targets/ReleasedProducts/SDK \
 	-I$(srcdir)/sysync_SDK/Sources \
-	-I$(srcdir)/Targets/ReleasedProducts/SDK
+	-I$(srcdir)/platform_adapters/linux/ \
+	-I$(srcdir)/platform_adapters/unix_common/ \
+	-I$(srcdir)/platform_adapters/ \
+	-I$(srcdir)/sysync/ \
+	-I$(srcdir)/syncml_tk/src/sml/inc/ \
+	-I$(srcdir)/syncml_tk/src/sml/lib/inc/ \
+	-I$(srcdir)/syncml_tk/src/sml/mgr/inc/ 
 
 libsynthesisstubs_la_LDFLAGS = -static
 libsynthesisstubs_la_SOURCES = sysync_SDK/Sources/enginestubs.c
diff --git a/src/Targets/ReleasedProducts/SDK/define.h b/src/Targets/ReleasedProducts/SDK/define.h
new file mode 100644
index 0000000..42b2247
--- /dev/null
+++ b/src/Targets/ReleasedProducts/SDK/define.h
@@ -0,0 +1,119 @@
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// NOTE: this is a local copy for this specific target
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+
+
+/*************************************************************************/
+/* module:          Compiler Flag Definition File                        */
+/* file:            define.h                                             */
+/* target system:   win                                                  */
+/* target OS:       win                                                  */
+/*************************************************************************/
+
+/*
+ * Copyright Notice
+ * Copyright (c) Ericsson, IBM, Lotus, Matsushita Communication
+ * Industrial Co., Ltd., Motorola, Nokia, Openwave Systems, Inc.,
+ * Palm, Inc., Psion, Starfish Software, Symbian, Ltd. (2001).
+ * All Rights Reserved.
+ * Implementation of all or part of any Specification may require
+ * licenses under third party intellectual property rights,
+ * including without limitation, patent rights (such a third party
+ * may or may not be a Supporter). The Sponsors of the Specification
+ * are not responsible and shall not be held responsible in any
+ * manner for identifying or failing to identify any or all such
+ * third party intellectual property rights.
+ *
+ * THIS DOCUMENT AND THE INFORMATION CONTAINED HEREIN ARE PROVIDED
+ * ON AN "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND AND ERICSSON, IBM,
+ * LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO. LTD, MOTOROLA,
+ * NOKIA, PALM INC., PSION, STARFISH SOFTWARE AND ALL OTHER SYNCML
+ * SPONSORS DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+ * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
+ * SHALL ERICSSON, IBM, LOTUS, MATSUSHITA COMMUNICATION INDUSTRIAL CO.,
+ * LTD, MOTOROLA, NOKIA, PALM INC., PSION, STARFISH SOFTWARE OR ANY
+ * OTHER SYNCML SPONSOR BE LIABLE TO ANY PARTY FOR ANY LOSS OF
+ * PROFITS, LOSS OF BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF
+ * BUSINESS, OR FOR DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL,
+ * PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND IN CONNECTION WITH
+ * THIS DOCUMENT OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH LOSS OR DAMAGE.
+ *
+ * The above notice and this paragraph must be included on all copies
+ * of this document that are made.
+ *
+ */
+
+/**
+ * File for Windows Specific Compiler Flags
+ */
+
+#ifndef _DEFINE_H
+  #define _DEFINE_H
+#define __ANSI_C__
+
+
+/* thread safety (added by luz@synthesis.ch, 2001-10-29) */
+/* Note: moved define of this to target_options.h of every target */
+#undef __MAKE_THREADSAFE
+
+/* enable Alloc helpers */
+#define __USE_ALLOCFUNCS__
+
+/* do we need WBXML (binary XML) processing ? */
+#define __SML_WBXML__
+/* do we need the capability to decode plain text tokens in WBXML? */
+#define __SML_WBXML_TEXTTOKENS__
+/* do we need XML processing ? */
+#define __SML_XML__
+/* are we using a 'light' toolkit ? */
+//#define __SML_LITE__
+/* do we use Sub DTD extensions ? */
+#define __USE_EXTENSIONS__
+/* do we need Metainformation DTD parsing ? */
+#define __USE_METINF__
+/* do we use Device Info DTD ? */
+#define __USE_DEVINF__
+
+/* which of the following optional commands should be included ? */
+
+#define ADD_SEND
+//#define ATOMIC_SEND
+//#define ATOMIC_RECEIVE
+//#define COPY_SEND
+//#define COPY_RECEIVE
+//#define EXEC_SEND
+//#define EXEC_RECEIVE
+#define GET_SEND
+#define MAP_RECEIVE
+#define MAPITEM_RECEIVE
+#define RESULT_RECEIVE
+//#define SEARCH_SEND
+//#define SEARCH_RECEIVE
+//#define SEQUENCE_SEND
+//#define SEQUENCE_RECEIVE
+
+
+/* TK: to improve interoperability and handling we
+ * switched to using .def files instead of compiler
+ * specific per function definitions. As long as we only
+ * use C this is the easiest and cleanes way
+ */
+
+#define SML_API
+#define SML_API_DEF
+#define XPT_API
+#define XPT_API_DEF
+
+
+/* Multi segment macro for Palm OS */
+#define LIB_FUNC
+#define MGR_FUNC
+#define WSM_FUNC
+#define XLT_FUNC
+
+#endif
diff --git a/src/Targets/ReleasedProducts/SDK/target_options.h b/src/Targets/ReleasedProducts/SDK/target_options.h
index 02dfeb0..4072c0a 100644
--- a/src/Targets/ReleasedProducts/SDK/target_options.h
+++ b/src/Targets/ReleasedProducts/SDK/target_options.h
@@ -50,6 +50,7 @@
 /* activate debug output */
 #define SYDEBUG 2
 
+#define NOWSM 1
 
 #endif /* TARGET_OPTIONS_H */
 /* eof */
diff --git a/src/synthesis-linker.map b/src/synthesis-linker.map
index 2435aca..efec2b7 100644
--- a/src/synthesis-linker.map
+++ b/src/synthesis-linker.map
@@ -6,6 +6,10 @@ VER_1.0 {
         extern "C++" {
                sysync::DataConversion*;
                sysync::SySyncDebugPuts*;
+               sysync::smlSrcTargLocURIToCharP*;
+               sysync::smlPCDataToLong*;
+               sysync::smlPCDataToCharP*;
+               sysync::StrToUShort*;
         };
     local:
         *;
diff --git a/src/sysync_SDK/Sources/stringutil.cpp b/src/sysync_SDK/Sources/stringutil.cpp
index 6f1df58..b7a18e0 100644
--- a/src/sysync_SDK/Sources/stringutil.cpp
+++ b/src/sysync_SDK/Sources/stringutil.cpp
@@ -12,6 +12,7 @@
 
 #include "target_options.h"
 
+#ifdef WITHOUT_SAN_1_1
 
 #if defined __MACH__ && !defined __GNUC__ /* used for va_list support */
   #include <mw_stdarg.h>
@@ -244,5 +245,6 @@ sInt16 HexStrToUIntPtr( cAppCharP aStr, uIntPtr &aIntPtr, sInt16 aMaxDigits )
   } // namespace
 #endif
 
+#endif //WITHOUT_SAN_1_1
 /* eof */