From: Jay S. <jay...@gm...> - 2006-12-29 00:47:37
|
I committed the tcp patch. The next patch is to get the rest of the core rdesktop files to compile under win32. Before I make the patch I'll explain a little problem. I can make this patch several different ways. Because of the way the rdesktop headers work, I have to include windows.h and winsock.h in rdesktop.h. This create typedef and define collisions in constants.h and types.h. HBITMAP and HCURSOR have problems in types.h. All the STATUS_* and CF_* defines have problems in constants.h. There are others as well. To fix this problem I can put an '_' or 'RD_' before these identifiers like 'RD_HBITMAP' and 'RD_HCURSOR.' We can make them lower case or even put an underscore at the end. I'm guess I'm asking what people prefer or if no one cares I'll put an 'RD_' prefix. There is another options as far as HBITMAP and HCURSOR and the other H* typedefs go. We can just remove them and use void * instead. I like that too. An example of the constant.h error. rdesktop constants.h defines #define CF_OWNERDISPLAY 128 and windows windefs.h defines #define CF_OWNERDISPLAY 0x80 Its really the same number but the compilers still complain. Another option with these CF_ problems. We can remove most of them only CF_TEXT and CF_UNICODETEXT are used. Another note, CF_MAX is defined differently depending on what WINVER is defined as in windows. We always define it as 17. We are not using it so it can't be a problem but another reason to remove it. Comments anyone. Jay |