diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2001-08-21 17:58:52 +0400 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2001-08-21 17:58:52 +0400 |
| commit | de8e9cfb39ad89d2edf2fae9b948369477a96aef (patch) | |
| tree | 1e0906313e2c10873e2331971db36ed63b12d19b /winsup/w32api/include/winsock2.h | |
| parent | b30eef0f67e8ced57cc670c56aa08516b5c69899 (diff) | |
* include/setupapi.h : New file.
* lib/setupapi.def:New file.
* lib/test.c: Include setupapi.h.
* include/winioctl.h (_DISK_PERFORMANCE): Correct typo.
* include/richedit.h (ENLINK): Add structure definition.
(EM_AUTOURLDETECT, EN_LINK, ENM_LINK): Add defines.
* include/shlobj.h (CMIC_*): Remove duplicate defines.
(CMDSTR_*): Remove duplicates; UNICODE string constants.
(GCS_*): Make UNICODE.
(CSIDL_*): Add more defines.
* include/winioctl.h (_MEDIA_TYPE): Add pointer typedef.
(_DISK_GEOMETRY): Ditto.
(_DISK_PERFORMANCE): Ditto.
* include/winbase.h (HasOverlappedIoCompleted): Add macro.
* include/winnt.h: Move CHAR, SHORT and LONG typedefs outside
of block protected by #ifndef VOID.
(This reverts 1998-12-01 Anders Norlander change.)
* include/odbcinst.h: End file with newline.
* include/raserror.h: Ditto.
* include/winsock2.h (#include <wtypes.h): Don't.
(_BLOB): Define instead, if not already done.
(__BLOB_T_DEFINED: New define for guarding _BLOB.
* include/wtypes.h (_BLOB): Guard against prior definition.
* include/oaidl.h (tagVARIANT): Mark anonymous structs and unions
as __extension__.
(tagTYPEDESC): Ditto.
(_wireBRECORD): Add structure definition.
(_wireSAFEARR_BRECORD): Ditto.
(_wireSAFEARR_HAVEIID): Ditto.
(_wireSAFEARRAY_UNION.u): Add fields SAFEARR_BRECORD RecordStr,
SAFEARR_HAVEIID HaveIidStr.
(tagVariant): Add fields _VARIANT_BOOL bool,*pbool.
(_wireVARIANT): Change field parray to type wirePSAFEARRAY,
pparray to wirePSAFEARRAY*.
(_wireVARIANT): Add field wireBRECORD brecVal.
(wireVARIANT): Change typedef to struct _wireVariant*.
(IRecordInfo): Add interface definition.
(LPRECORDINFO): Add typedef for IRecordInfo*.
(IID_IRecordInfo): Add forward decalaration.
* include/lmcons.h: Guard CNLEN and UNCLEN against prior definition.
* include/nddeapi.h: Likewise.
* ChangeLog: Formatting and typo fixes.
Diffstat (limited to 'winsup/w32api/include/winsock2.h')
| -rw-r--r-- | winsup/w32api/include/winsock2.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h index ca13028d4..83c48faec 100644 --- a/winsup/w32api/include/winsock2.h +++ b/winsup/w32api/include/winsock2.h @@ -17,10 +17,6 @@ #include <windows.h> -#ifndef _WTYPES_H -#include <wtypes.h> /* for BLOB */ -#endif - #ifdef __cplusplus extern "C" { #endif @@ -709,6 +705,13 @@ typedef struct _WSAVersion * but itself needs LPSOCKADDR which is defined earlier in this file */ #include <nspapi.h> +#ifndef __BLOB_T_DEFINED /* also in wtypes.h */ +#define __BLOB_T_DEFINED +typedef struct _BLOB { + ULONG cbSize; + BYTE *pBlobData; +} BLOB,*PBLOB,*LPBLOB; +#endif typedef struct _WSAQuerySetA { |