diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9062760fd52..5bfc4e64caa 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -50,42 +50,6 @@ typedef struct { streamsize arg; } manip_streamsize; -typedef struct { - const vtable_ptr *vtable; - mutex lock; - char *rbuf; - char *wbuf; - char **prbuf; - char **pwbuf; - char *rpos; - char *wpos; - char **prpos; - char **pwpos; - int rsize; - int wsize; - int *prsize; - int *pwsize; - locale *loc; -} basic_streambuf_char; - -typedef struct { - const vtable_ptr *vtable; - mutex lock; - wchar_t *rbuf; - wchar_t *wbuf; - wchar_t **prbuf; - wchar_t **pwbuf; - wchar_t *rpos; - wchar_t *wpos; - wchar_t **prpos; - wchar_t **pwpos; - int rsize; - int wsize; - int *prsize; - int *pwsize; - locale *loc; -} basic_streambuf_wchar; - typedef enum { INITFL_new = 0, INITFL_open = 1, diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ca26378b743..94b338490f2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -104,14 +104,14 @@ typedef struct { typedef struct _istreambuf_iterator_char { - struct _basic_streambuf_char *strbuf; + basic_streambuf_char *strbuf; MSVCP_bool got; char val; } istreambuf_iterator_char; typedef struct _istreambuf_iterator_wchar { - struct _basic_streambuf_wchar *strbuf; + basic_streambuf_wchar *strbuf; MSVCP_bool got; wchar_t val; } istreambuf_iterator_wchar; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 2dde3300074..e6cffc7762a 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -484,5 +484,43 @@ typedef struct _ios_base { locale *loc; } ios_base; +/* class basic_streambuf */ +typedef struct { + const vtable_ptr *vtable; + mutex lock; + char *rbuf; + char *wbuf; + char **prbuf; + char **pwbuf; + char *rpos; + char *wpos; + char **prpos; + char **pwpos; + int rsize; + int wsize; + int *prsize; + int *pwsize; + locale *loc; +} basic_streambuf_char; + +/* class basic_streambuf */ +typedef struct { + const vtable_ptr *vtable; + mutex lock; + wchar_t *rbuf; + wchar_t *wbuf; + wchar_t **prbuf; + wchar_t **pwbuf; + wchar_t *rpos; + wchar_t *wpos; + wchar_t **prpos; + wchar_t **pwpos; + int rsize; + int wsize; + int *prsize; + int *pwsize; + locale *loc; +} basic_streambuf_wchar; + void init_io(void); void free_io(void);