blob: 3fe665e7140c23fbf2b0829bacafd574f80618d8 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- gfx/layers/opengl/ImageLayerOGL.cpp~
+++ gfx/layers/opengl/ImageLayerOGL.cpp
@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
{
if (mSharedHandle) {
gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
- mSharedHandle = NULL;
+ mSharedHandle = 0;
}
mYUVTexture[0].Release();
--- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
+++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp
@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
struct tm *tmc;
int i;
- tt = time((time_t)NULL);
+ tt = time(NULL);
tmc = localtime(&tt);
tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM
--- ipc/glue/CrossProcessMutex_unimplemented.cpp~
+++ ipc/glue/CrossProcessMutex_unimplemented.cpp
@@ -40,7 +40,7 @@ CrossProcessMutexHandle
CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
{
NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
- return NULL;
+ return 0;
}
}
|
