{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1755713754, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"09d369e3789aecc33202b5972d9f0d71", "commit": {"type":"commit", "time": 1503698370, "time_ofs": 120, "oid_tree": { "oid": "4b5f04252aa2205c916a17cd7af60ccd56b8f7de", "alias": []}, "oid":{ "oid": "9a5d80cb5e44aa0908f4b10e5fca1eac5a0792ca", "alias": []}, "msg": "Move more socket stuff", "sig_commit": { "git_time": { "time": 1503698370, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }, "sig_author": { "git_time": { "time": 1503664561, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }}, "body": "Move more socket stuff\n\nThe socket stuff for DJGPP and VMS was only partially moved to\ninclude/internal/sockets.h...\n\nRemains vxWorks.\n\nReviewed-by: Rich Salz \u003crsalz@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/4254)\n" , "diff": "diff --git a/e_os.h b/e_os.h\nindex 0ec6da9..d7e7185 100644\n--- a/e_os.h\n+++ b/e_os.h\n@@ -91,7 +91,6 @@ extern \u0022C\u0022 {\n # endif\n \n # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)\n-# define NO_SYS_PARAM_H\n # define NO_CHMOD\n # define NO_SYSLOG\n # endif\n@@ -113,7 +112,6 @@ extern \u0022C\u0022 {\n # endif\n \n # ifdef WIN32\n-# define NO_SYS_UN_H\n # undef get_last_sys_error\n # undef clear_sys_error\n # define get_last_sys_error() GetLastError()\n@@ -129,10 +127,6 @@ extern \u0022C\u0022 {\n # ifdef __DJGPP__\n # include \u003cunistd.h\u003e\n # include \u003csys/stat.h\u003e\n-# include \u003csys/socket.h\u003e\n-# include \u003csys/un.h\u003e\n-# include \u003ctcp.h\u003e\n-# include \u003cnetdb.h\u003e\n # define _setmode setmode\n # define _O_TEXT O_TEXT\n # define _O_BINARY O_BINARY\n@@ -311,9 +305,6 @@ extern FILE *_imp___iob;\n */\n # define EXIT(n) exit((n) ? (((n) \u003c\u003c 3) | 2 | 0x10000000 | 0x35a000) : 1)\n \n-# define NO_SYS_PARAM_H\n-# define NO_SYS_UN_H\n-\n # define DEFAULT_HOME \u0022SYS$LOGIN:\u0022\n \n # else\ndiff --git a/include/internal/sockets.h b/include/internal/sockets.h\nindex c64e74c..cc45424 100644\n--- a/include/internal/sockets.h\n+++ b/include/internal/sockets.h\n@@ -10,24 +10,39 @@\n \n #ifndef HEADER_OPENSSL_SOCKETS\n \n+# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)\n+# define NO_SYS_PARAM_H\n+# endif\n+# ifdef WIN32\n+# define NO_SYS_UN_H\n+# endif\n+# ifdef OPENSSL_SYS_VMS\n+# define NO_SYS_PARAM_H\n+# define NO_SYS_UN_H\n+# endif\n+\n # ifdef OPENSSL_NO_SOCK\n \n # elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)\n-# if !defined(__DJGPP__)\n-# if defined(_WIN32_WCE) \u0026\u0026 _WIN32_WCE\u003c410\n-# define getservbyname _masked_declaration_getservbyname\n-# endif\n-# if !defined(IPPROTO_IP)\n- /* winsock[2].h was included already? */\n-# include \u003cwinsock.h\u003e\n-# endif\n-# ifdef getservbyname\n+# if defined(__DJGPP__)\n+# include \u003csys/socket.h\u003e\n+# include \u003csys/un.h\u003e\n+# include \u003ctcp.h\u003e\n+# include \u003cnetdb.h\u003e\n+# elif defined(_WIN32_WCE) \u0026\u0026 _WIN32_WCE\u003c410\n+# define getservbyname _masked_declaration_getservbyname\n+# endif\n+# if !defined(IPPROTO_IP)\n+ /* winsock[2].h was included already? */\n+# include \u003cwinsock.h\u003e\n+# endif\n+# ifdef getservbyname\n /* this is used to be wcecompat/include/winsock_extras.h */\n-# undef getservbyname\n+# undef getservbyname\n struct servent *PASCAL getservbyname(const char *, const char *);\n-# endif\n+# endif\n \n-# ifdef _WIN64\n+# ifdef _WIN64\n /*\n * Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because\n * the value constitutes an index in per-process table of limited size\n@@ -35,10 +50,8 @@ struct servent *PASCAL getservbyname(const char *, const char *);\n * Windows run on happen to be two's-complement, which allows to\n * interchange INVALID_SOCKET and -1.\n */\n-# define socket(d,t,p) ((int)socket(d,t,p))\n-# define accept(s,f,l) ((int)accept(s,f,l))\n-# endif\n-# else\n+# define socket(d,t,p) ((int)socket(d,t,p))\n+# define accept(s,f,l) ((int)accept(s,f,l))\n # endif\n \n # else\n","s":{"c":1755713754,"u": 41732}} ],"g": 42926,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}