From ccf2bb96a56c8de80569626743467d2c1503bb9b Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 17 Mar 2005 21:26:59 +0000 Subject: [PATCH] applied patch #1164307 - Fixes to allow building Contrib/ on debian (minus Makefiles) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3923 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/AdvSplash/advsplash.c | 2 +- Contrib/Banner/Banner.c | 4 ++-- Contrib/BgImage/BgImage.cpp | 8 ++++---- Contrib/Dialer/dialer.c | 6 +++--- Contrib/InstallOptions/InstallerOptions.cpp | 4 ++-- Contrib/LangDLL/LangDLL.c | 4 ++-- Contrib/Library/TypeLib/TypeLib.cpp | 4 ++-- Contrib/Makensisw/makensisw.cpp | 2 +- Contrib/NSISdl/nsisdl.cpp | 2 +- Contrib/Splash/splash.c | 2 +- Contrib/StartMenu/StartMenu.c | 4 ++-- Contrib/UIs/UI Holder/ui.cpp | 6 +++--- Contrib/UserInfo/UserInfo.c | 2 +- Contrib/VPatch/Source/Plugin/vpatchdll.c | 4 ++-- Contrib/nsExec/nsexec.c | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Contrib/AdvSplash/advsplash.c b/Contrib/AdvSplash/advsplash.c index 7c95e998..5d466c2b 100644 --- a/Contrib/AdvSplash/advsplash.c +++ b/Contrib/AdvSplash/advsplash.c @@ -3,7 +3,7 @@ #include #include -#include "..\exdll\exdll.h" +#include "../ExDLL/exdll.h" HINSTANCE g_hInstance; diff --git a/Contrib/Banner/Banner.c b/Contrib/Banner/Banner.c index 6a6d80de..f2d4817d 100644 --- a/Contrib/Banner/Banner.c +++ b/Contrib/Banner/Banner.c @@ -1,5 +1,5 @@ #include -#include "../exdll/exdll.h" +#include "../ExDLL/exdll.h" #include "../../Source/exehead/resource.h" // Turn a pair of chars into a word @@ -168,4 +168,4 @@ unsigned int myatoi(char *s) v+=c; } return v; -} \ No newline at end of file +} diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp index 26ca0ec1..5105bee4 100644 --- a/Contrib/BgImage/BgImage.cpp +++ b/Contrib/BgImage/BgImage.cpp @@ -1,6 +1,6 @@ -#include -#include -#include "../exdll/exdll.h" +#include +#include +#include "../ExDLL/exdll.h" #undef EXDLL_INIT @@ -648,4 +648,4 @@ BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved break; } return TRUE; -} \ No newline at end of file +} diff --git a/Contrib/Dialer/dialer.c b/Contrib/Dialer/dialer.c index b889840b..71a43af2 100644 --- a/Contrib/Dialer/dialer.c +++ b/Contrib/Dialer/dialer.c @@ -1,8 +1,8 @@ #define WIN32_LEAN_AND_MEAN #include -#include +#include -#include "../exdll/exdll.h" +#include "../ExDLL/exdll.h" #define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) @@ -57,4 +57,4 @@ NSISFunction(AutodialHangup) { else pushstring("failure"); -} \ No newline at end of file +} diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 43078d8b..213499e8 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -12,10 +12,10 @@ #include #include #include "resource.h" -#include "Shellapi.h" +#include "shellapi.h" #define popstring dontuseme -#include "../exdll/exdll.h" +#include "../ExDLL/exdll.h" #undef popstring // Use for functions only called from one place to possibly reduce some code diff --git a/Contrib/LangDLL/LangDLL.c b/Contrib/LangDLL/LangDLL.c index a7469d47..717e4167 100644 --- a/Contrib/LangDLL/LangDLL.c +++ b/Contrib/LangDLL/LangDLL.c @@ -10,7 +10,7 @@ // LangDLL:LangDialog "Language Selection" "Choose a language" 2F French 1036 English 1033 12 Garamond -#include "../exdll/exdll.h" +#include "../ExDLL/exdll.h" int myatoi(char *s); @@ -160,4 +160,4 @@ int myatoi(char *s) v+=c; } return (int)v; -} \ No newline at end of file +} diff --git a/Contrib/Library/TypeLib/TypeLib.cpp b/Contrib/Library/TypeLib/TypeLib.cpp index 734d8e39..a111e00b 100644 --- a/Contrib/Library/TypeLib/TypeLib.cpp +++ b/Contrib/Library/TypeLib/TypeLib.cpp @@ -6,7 +6,7 @@ */ #include -#include "../../exdll/exdll.h" +#include "../../ExDLL/exdll.h" #define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) @@ -120,4 +120,4 @@ NSISFunction(GetLibVersion) { } -} \ No newline at end of file +} diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index b45b29db..1556f8e0 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -21,7 +21,7 @@ #define MAKENSISW_CPP #include -#include +#include #include #include "makensisw.h" #include "resource.h" diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 124a126b..c361f429 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -25,7 +25,7 @@ #include "netinc.h" #include "util.h" #include "httpget.h" -#include "../exdll/exdll.h" +#include "../ExDLL/exdll.h" void *operator new( unsigned int num_bytes ) { diff --git a/Contrib/Splash/splash.c b/Contrib/Splash/splash.c index 5f86b3c2..20588bf5 100644 --- a/Contrib/Splash/splash.c +++ b/Contrib/Splash/splash.c @@ -1,5 +1,5 @@ #include -#include "../exdll/exdll.h" +#include "../ExDLL/exdll.h" HINSTANCE g_hInstance; diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c index 9c9d37ce..233319d1 100644 --- a/Contrib/StartMenu/StartMenu.c +++ b/Contrib/StartMenu/StartMenu.c @@ -1,6 +1,6 @@ #include #include -#include "../exdll/exdll.h" +#include "../ExDLL/exdll.h" #include "resource.h" HINSTANCE g_hInstance; @@ -433,4 +433,4 @@ void AddFolderFromReg(int nFolder) } while (FindNextFile(hSearch, &FileData)); FindClose(hSearch); } -} \ No newline at end of file +} diff --git a/Contrib/UIs/UI Holder/ui.cpp b/Contrib/UIs/UI Holder/ui.cpp index 46003f93..a7e4d916 100644 --- a/Contrib/UIs/UI Holder/ui.cpp +++ b/Contrib/UIs/UI Holder/ui.cpp @@ -1,8 +1,8 @@ // ui.cpp : Defines the entry point for the application. // -#include -#include +#include +#include #include "resource.h" HINSTANCE g_hInstance; @@ -95,4 +95,4 @@ int APIENTRY WinMain(HINSTANCE hInstance, ExitProcess(0); return 0; -} \ No newline at end of file +} diff --git a/Contrib/UserInfo/UserInfo.c b/Contrib/UserInfo/UserInfo.c index 31d47989..0e22c30a 100644 --- a/Contrib/UserInfo/UserInfo.c +++ b/Contrib/UserInfo/UserInfo.c @@ -1,5 +1,5 @@ #include -#include "..\exdll\exdll.h" +#include "../ExDLL/exdll.h" void __declspec(dllexport) GetName(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) diff --git a/Contrib/VPatch/Source/Plugin/vpatchdll.c b/Contrib/VPatch/Source/Plugin/vpatchdll.c index b6ce6d90..d6907247 100644 --- a/Contrib/VPatch/Source/Plugin/vpatchdll.c +++ b/Contrib/VPatch/Source/Plugin/vpatchdll.c @@ -1,6 +1,6 @@ #define WIN32_LEAN_AND_MEAN #include -#include "..\..\..\ExDLL\exdll.h" +#include "../../../ExDLL/exdll.h" int DoPatch(HANDLE hPatch, HANDLE hSource, HANDLE hDest); void strcopy(char *tgt, const char *src); @@ -107,7 +107,7 @@ BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) UINT CRCTable[256]; BOOL bInitCRC = FALSE; -_inline void InitCRC() { +inline void InitCRC() { int i, j; unsigned long c; for (c = i = 0; i < 256; c = ++i) { for (j = 0; j < 8; j++) { diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c index 07306fb7..523e0e3d 100644 --- a/Contrib/nsExec/nsexec.c +++ b/Contrib/nsExec/nsexec.c @@ -20,8 +20,8 @@ freely, subject to the following restrictions: */ #include #include -#include -#include "../exdll/exdll.h" +#include +#include "../ExDLL/exdll.h" #ifndef true #define true TRUE