Skip to content

Commit 699a3cd

Browse files
author
Alexey Semenyuk
committed
8223188: Removed unnecessary #ifdef __cplusplus from .cpp sources
Reviewed-by: herrick, almatvee, iklam
1 parent 05c6009 commit 699a3cd

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/jdk.jpackage/windows/native/libjpackage/WindowsRegistry.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ std::wstring GetLongPath(const std::wstring& path) {
6868

6969
} // namespace
7070

71-
#ifdef __cplusplus
71+
7272
extern "C" {
73-
#endif
73+
7474
#undef jdk_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE
7575
#define jdk_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE 1L
7676

@@ -216,6 +216,4 @@ extern "C" {
216216
return JNI_FALSE;
217217
}
218218

219-
#ifdef __cplusplus
220-
}
221-
#endif
219+
} // extern "C"

src/jdk.jpackage/windows/native/libjpackage/jpackage.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
#include "JniUtils.h"
3131
#include "MsiDb.h"
3232

33-
#ifdef __cplusplus
3433
extern "C" {
35-
#endif
3634

3735
/*
3836
* Class: jdk_jpackage_internal_ExecutableRebrander
@@ -159,6 +157,4 @@ extern "C" {
159157
return 1;
160158
}
161159

162-
#ifdef __cplusplus
163-
}
164-
#endif
160+
} // extern "C"

0 commit comments

Comments
 (0)