Still trying to get this to compile under VS.NET

apps/sam/c/inc/platform.h

@@ -28,33 +28,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PLATFORM_H
+#ifndef LIBSAM_PLATFORM_H
-#define PLATFORM_H
+#define LIBSAM_PLATFORM_H
 
 /*
  * Operating system
  */
 #define FREEBSD	0  // FreeBSD
-#define MINGW	1  // Windows native (Mingw)
+#define CYGWIN	1  // Cygwin
 #define LINUX	2  // Linux
-#define CYGWIN	3  // Cygwin
+#define MINGW	3  // Windows native (Mingw)
-
+#define MSVC	4  // Windows native (Visual C++ 2003)
-#if OS == MINGW
-	#define INET_ADDRSTRLEN 16
-	#define NO_GETHOSTBYNAME2
-	#define NO_INET_ATON  /* implies NO_INET_PTON */
-	#define NO_INET_NTOP
-	#define NO_SSIZE_T
-	#define NO_STRL
-	#define NO_Z_FORMAT
-	#define WINSOCK
-#endif
-
-#if OS == LINUX
-	#define NO_GETHOSTBYNAME2
-	#define NO_STRL
-	#define NO_Z_FORMAT
-#endif
 
 #if OS == CYGWIN
 	#define INET_ADDRSTRLEN 16
@@ -67,12 +51,29 @@
 	#define NO_Z_FORMAT
 #endif
 
-/*
+#if OS == LINUX
- * Standard C99 includes - if your compiler doesn't have these, it's time to
+	#define NO_GETHOSTBYNAME2
- * upgrade
+	#define NO_STRL
- */
+	#define NO_Z_FORMAT
-#include <stdbool.h>  // bool
+#endif
-#include <stddef.h>  // size_t
+
+#if OS == MINGW
+	#define INET_ADDRSTRLEN 16
+	#define NO_GETHOSTBYNAME2
+	#define NO_INET_ATON  // implies NO_INET_PTON
+	#define NO_INET_NTOP
+	#define NO_SSIZE_T
+	#define NO_STRL
+	#define NO_Z_FORMAT
+	#define WINSOCK
+#endif
+
+#if OS == MSVC  // FIXME: doesn't work
+	#define NO_STDBOOL_H
+	#define NO_SSIZE_T
+	#define NO_STRL
+	#define WINSOCK
+#endif
 
 /*
  * System includes
@@ -141,4 +142,4 @@ typedef unsigned short ushort;
 	#include <ctype.h>
 #endif
 
-#endif  /* PLATFORM_H */
+#endif  /* LIBSAM_PLATFORM_H */

apps/sam/c/inc/sam.h

@@ -28,17 +28,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SAM_H
+#ifndef LIBSAM_SAM_H
-#define SAM_H
+#define LIBSAM_SAM_H
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
+#ifdef NO_STDBOOL_H
- * Standard C99 includes - if your compiler doesn't have these, it's time to
+	typedef int bool;
- * upgrade
+	#define true 0
- */
+	#define false 1
-#include <stdbool.h>  // bool
+#else
+	#include <stdbool.h>
+#endif
 #include <stddef.h>  // size_t
 
 
@@ -70,12 +72,6 @@ extern "C" {
  * Some LibSAM variable types
  */
 
-#ifdef WINSOCK
-	typedef SOCKET socket_t;
-#else
-	typedef int socket_t;
-#endif
-
 typedef enum {SAM_STREAM, SAM_DGRAM, SAM_RAW} sam_conn_t;  /* SAM connection */
 
 typedef char sam_pubkey_t[SAM_PUBKEY_LEN];  /* base 64 public key */
@@ -88,7 +84,7 @@ typedef struct {
 typedef long sam_sid_t;  /* stream id number */
 
 typedef struct {
-	socket_t sock;  /* the socket used for communications with SAM */
+	int sock;  /* the socket used for communications with SAM */
 	bool connected;  /* whether the socket is connected */
 	sam_sid_t prev_id;  /* the last stream id number we used */
 } sam_sess_t;  /* a SAM session */
@@ -166,4 +162,4 @@ void		(*sam_rawback)(sam_sess_t *session, void *data, size_t size);
 #ifdef __cplusplus
 }
 #endif
-#endif  /* SAM_H */
+#endif  /* LIBSAM_SAM_H */

apps/sam/c/inc/snprintf.h

@@ -33,8 +33,8 @@
  * snprintf.c)
  */
 
-#ifndef SNPRINTF_H
+#ifndef LIBSAM_SNPRINTF_H
-#define SNPRINTF_H
+#define LIBSAM_SNPRINTF_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -46,4 +46,4 @@ int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
 #ifdef __cplusplus
 }
 #endif
-#endif  /* SNPRINTF_H */
+#endif  /* LIBSAM_SNPRINTF_H */

apps/sam/c/inc/strl.h

@@ -32,8 +32,8 @@
  * Note: The strl.c file retains its original license (at the top of strl.c)
  */
 
-#ifndef STRL_H
+#ifndef LIBSAM_STRL_H
-#define STRL_H
+#define LIBSAM_STRL_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -44,4 +44,4 @@ extern size_t strlcpy(char *dst, const char *src, size_t siz);
 #ifdef __cplusplus
 }
 #endif
-#endif  /* STRL_H */
+#endif  /* LIBSAM_STRL_H */