[srm-cvs] CVS Update: - Correcting for Darwin/MacOSX builds

Date: Thu Feb 20 04:20:22 CET 2003
User: Dan Kalowsky
Directory: srm/main/src

Log Message:
 [0.30]
 - Correcting for Darwin/MacOSX builds
 # The functions.h was altered because the SRM_MACOSX define was not
 # being propogated to srm_client.c (which was in config.h). Better
 # solutions are welcome...
 
Modified files:
           srm/main/src/functions.h (version: 1.39)
           srm/main/src/srm_client.c (version: 1.19)

[FILE: /srm/main/src/functions.h]

--- srm/main/src/functions.h:1.38 Sun Feb 16 12:02:18 2003 GMT
+++ srm/main/src/functions.h Thu Feb 20 02:20:21 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.38 2003/02/16 13:02:18 derick Exp $ */
+/* $Id: cvstemp,v 1.39 2003/02/20 03:20:21 kalowsky Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -24,6 +24,7 @@
 #define __FUNCTIONS_H__
 
 #include <string.h>
+#include "config.h" /* Needed for OSX only??? */
 #include "srm_config.h"
 #include "srm_hash.h"
 #include "srm_value.h"

[FILE: /srm/main/src/srm_client.c]

--- srm/main/src/srm_client.c:1.18 Wed Feb 19 19:40:27 2003 GMT
+++ srm/main/src/srm_client.c Thu Feb 20 02:20:21 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.18 2003/02/19 20:40:27 derick Exp $ */
+/* $Id: cvstemp,v 1.19 2003/02/20 03:20:21 kalowsky Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -23,8 +23,11 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/socket.h>
 #include <sys/un.h>
+#if defined(SRM_MACOSX)
+#include <netinet/in.h> /* Needed for MACOSX sockaddr_in */
+#endif
+#include <sys/socket.h>
 #include <netdb.h>
 
 #include "srm_client.h"
@@ -96,8 +99,8 @@
 
 struct srm_value *srm_connect (srm_host_t host, protocol_t prot, encryption_t enc, connect_data_t *connect_data)
 {
- struct sockaddr_in server_in;
         struct sockaddr_un server_un;
+ struct sockaddr_in server_in;
         struct hostent *host_info;
         srm_value *ret_val = NULL;
         srm_ui32 size;
Received on Thu Feb 20 04:20:25 2003