Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-10-15 06:15:07 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-15 06:15:07 +0400
commit4d4664d98f49cfb171a43bd6ae6bb002b5f3c34b (patch)
treee458f200b0061c4adec3a0d5b8f7f523b647c036 /release/windows
parent977aaeb95c2946f2c8d83dd6a15979424a869eda (diff)
code cleanup: check for msvc directly when using warning pragma's.
Diffstat (limited to 'release/windows')
-rw-r--r--release/windows/contrib/vfapi/vfapi-plugin.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/release/windows/contrib/vfapi/vfapi-plugin.c b/release/windows/contrib/vfapi/vfapi-plugin.c
index 8d63baa0ce4..0af96d14d6f 100644
--- a/release/windows/contrib/vfapi/vfapi-plugin.c
+++ b/release/windows/contrib/vfapi/vfapi-plugin.c
@@ -15,7 +15,6 @@
*
*/
-
#include <windows.h>
#include <winbase.h>
#include <stdio.h>
@@ -83,16 +82,16 @@ typedef struct {
} VF_ReadData_Audio,*LPVF_ReadData_Audio;
typedef struct {
- DWORD dwSize;
- HRESULT (__stdcall *OpenFile)(
- char *lpFileName, LPVF_FileHandle lpFileHandle );
+ DWORD dwSize;
+ HRESULT (__stdcall *OpenFile)(
+ char *lpFileName, LPVF_FileHandle lpFileHandle );
HRESULT (__stdcall *CloseFile)( VF_FileHandle hFileHandle );
HRESULT (__stdcall *GetFileInfo)( VF_FileHandle hFileHandle,
- LPVF_FileInfo lpFileInfo );
+ LPVF_FileInfo lpFileInfo );
HRESULT (__stdcall *GetStreamInfo)( VF_FileHandle hFileHandle,
- DWORD dwStream,void *lpStreamInfo );
+ DWORD dwStream,void *lpStreamInfo );
HRESULT (__stdcall *ReadData)( VF_FileHandle hFileHandle,
- DWORD dwStream,void *lpData );
+ DWORD dwStream,void *lpData );
} VF_PluginFunc,*LPVF_PluginFunc;
__declspec(dllexport) HRESULT vfGetPluginInfo(
@@ -117,8 +116,9 @@ static unsigned long getipaddress(const char * ipaddr)
struct hostent *host;
unsigned long ip;
- if (((ip = inet_addr(ipaddr)) == INADDR_NONE)
- && strcmp(ipaddr, "255.255.255.255") != 0) {
+ if (((ip = inet_addr(ipaddr)) == INADDR_NONE) &&
+ strcmp(ipaddr, "255.255.255.255") != 0)
+ {
if ((host = gethostbyname(ipaddr)) != NULL) {
memcpy(&ip, host->h_addr, sizeof(ip));
}
@@ -419,6 +419,3 @@ __declspec(dllexport) HRESULT vfGetPluginFunc(
return VF_OK;
}
-
-
-