Do NOT include defines.h in .rc files.

svn path=/trunk/; revision=15968
This commit is contained in:
Filip Navara 2005-06-17 11:28:23 +00:00
parent bd0ef4def4
commit 14e5873c84
32 changed files with 28 additions and 54 deletions

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,4 +1,5 @@
#include <defines.h> #include <windows.h>
#include <reactos/resource.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,7 +1,3 @@
#include <reactos/resource.h>
#include <defines.h>
#include "resource.h"
LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
IDD_SECPAGE DIALOGEX 0, 0, 227, 215 IDD_SECPAGE DIALOGEX 0, 0, 227, 215

View file

@ -1,7 +1,3 @@
#include <reactos/resource.h>
#include <defines.h>
#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_SECPAGE DIALOGEX 0, 0, 227, 215 IDD_SECPAGE DIALOGEX 0, 0, 227, 215

View file

@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <reactos/resource.h>
#include <defines.h>
#include "resource.h"
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
IDD_SECPAGE DIALOGEX 0, 0, 227, 215 IDD_SECPAGE DIALOGEX 0, 0, 227, 215

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "Advanced W32 Base API\0" #define REACTOS_STR_FILE_DESCRIPTION "Advanced W32 Base API\0"

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Advpack User Library\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Advpack User Library\0"

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,9 +1,5 @@
#include "resource.h" #include "resource.h"
#ifdef _MSC_VER #include <windows.h>
#include <../../../include/defines.h>
#else
#include <defines.h>
#endif
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0"

View file

@ -1,12 +1,8 @@
//Microsoft Developer Studio generated resource script. //Microsoft Developer Studio generated resource script.
// //
#include "resource.h" #include "resource.h"
#ifndef MS_COMPILER
#include <reactos/resource.h> #include <reactos/resource.h>
#include <defines.h> #include <windows.h>
#else
#include <../../../include/defines.h>
#endif
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Control Panel\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Control Panel\0"
#define REACTOS_STR_INTERNAL_NAME "control\0" #define REACTOS_STR_INTERNAL_NAME "control\0"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,6 +1,6 @@
/* $Id: cplsample.rc 12852 2005-01-06 13:58:04Z mf $ */ /* $Id: cplsample.rc 12852 2005-01-06 13:58:04Z mf $ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,11 +1,7 @@
/* $Id$ */ /* $Id$ */
#include "resource.h" #include "resource.h"
#ifdef _MSC_VER #include <windows.h>
#include <../../../include/defines.h>
#else
#include <defines.h>
#endif
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Control Panel\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Control Panel\0"

View file

@ -2,7 +2,6 @@
#include "resource.h" #include "resource.h"
#include "windows.h" #include "windows.h"
#include <defines.h>
#include <commctrl.h> #include <commctrl.h>
#include "resource.h" #include "resource.h"

View file

@ -1,6 +1,5 @@
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include <defines.h>
#include "resource.h" #include "resource.h"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" #define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0"

View file

@ -1,4 +1,4 @@
#include "defines.h" #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS RPC server API\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS RPC server API\0"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL

View file

@ -1,7 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include <winuser.h>
#include <resource.h> #include <resource.h>

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "explorer_intres.rc" #include "explorer_intres.rc"

View file

@ -1,6 +1,6 @@
/* $Id: ibrowser.rc 12752 2005-01-03 11:25:40Z mf $ */ /* $Id: ibrowser.rc 12752 2005-01-03 11:25:40Z mf $ */
#include <defines.h> #include <windows.h>
#include "ibrowser_intres.rc" #include "ibrowser_intres.rc"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup\0"

View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0"

View file

@ -1,4 +1,4 @@
#include <defines.h> #include <windows.h>
#include "reporterror.h" #include "reporterror.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Error Reporting Assistant\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Error Reporting Assistant\0"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resources.h" #include "resources.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sound Volume Control\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sound Volume Control\0"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "vmwinst.h" #include "vmwinst.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS VMware(r) driver installation utility\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS VMware(r) driver installation utility\0"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS-Welcome\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS-Welcome\0"

View file

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
#include <defines.h> #include <windows.h>
#include "resource.h" #include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon Application\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon Application\0"