diff options
| author | gingerBill <bill@gingerbill.org> | 2025-01-31 08:34:21 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2025-01-31 08:34:21 +0000 |
| commit | 5d758cd020ab1b2e8e83c1a829d176bb8cf48abc (patch) | |
| tree | 1c326ce0dd4e1557983a932292a6640db6dce8c4 /core/sys | |
| parent | 0cd20e61ab5989e7a759051df2a629facfb53f41 (diff) | |
| parent | f6001e1b0c158c768dce59337c9454ccd14e8595 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
Diffstat (limited to 'core/sys')
| -rw-r--r-- | core/sys/darwin/Foundation/NSSavePanel.odin | 6 | ||||
| -rw-r--r-- | core/sys/linux/bits.odin | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/sys/darwin/Foundation/NSSavePanel.odin b/core/sys/darwin/Foundation/NSSavePanel.odin index 2f89696ee..f026b482d 100644 --- a/core/sys/darwin/Foundation/NSSavePanel.odin +++ b/core/sys/darwin/Foundation/NSSavePanel.odin @@ -10,10 +10,10 @@ SavePanel_runModal :: proc "c" (self: ^SavePanel) -> ModalResponse { @(objc_type=SavePanel, objc_name="savePanel", objc_is_class_method=true) SavePanel_savePanel :: proc "c" () -> ^SavePanel { - return msgSend(^SavePanel, SavePanel, "savePanel") + return msgSend(^SavePanel, SavePanel, "savePanel") } @(objc_type=SavePanel, objc_name="URL") SavePanel_URL :: proc "c" (self: ^SavePanel) -> ^Array { - return msgSend(^Array, self, "URL") -}
\ No newline at end of file + return msgSend(^Array, self, "URL") +} diff --git a/core/sys/linux/bits.odin b/core/sys/linux/bits.odin index c304397de..4493ea767 100644 --- a/core/sys/linux/bits.odin +++ b/core/sys/linux/bits.odin @@ -1329,6 +1329,7 @@ Socket_Option :: enum { ACCEPTCONN = 30, PEERSEC = 31, PASSSEC = 34, + IP_ADD_MEMBERSHIP = 35, MARK = 36, PROTOCOL = 38, DOMAIN = 39, |