Skip to content

chore: remove useless cgo imports #2115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dunglas wants to merge 3 commits into
base: main
Choose a base branch
from
+2 −10
Open

chore: remove useless cgo imports #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a66595
chore: remove useless cgo imports
dunglas Jan 8, 2026
bc1fa6f
remove unistd.h
dunglas Jan 8, 2026
1e10aca
remove PHPAPI macro as we don't export these functions
dunglas Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions frankenphp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#if defined(__linux__)
#include <sys/prctl.h>
#elif defined(__FreeBSD__) || defined(__OpenBSD__)
Expand Down Expand Up @@ -205,7 +204,7 @@ bool frankenphp_shutdown_dummy_request(void) {
return true;
}

PHPAPI void get_full_env(zval *track_vars_array) {
void get_full_env(zval *track_vars_array) {
go_getfullenv(thread_index, track_vars_array);
}

Expand Down Expand Up @@ -1266,7 +1265,7 @@ static zend_module_entry *modules = NULL;
static int modules_len = 0;
static int (*original_php_register_internal_extensions_func)(void) = NULL;

PHPAPI int register_internal_extensions(void) {
int register_internal_extensions(void) {
if (original_php_register_internal_extensions_func != NULL &&
original_php_register_internal_extensions_func() != SUCCESS) {
return FAILURE;
Expand Down
1 change: 0 additions & 1 deletion internal/phpheaders/phpheaders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package phpheaders

import "C"
Copy link
Contributor

@AlliBalliBaba AlliBalliBaba Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not having import "C" in modules makes test ./... fail sometimes.

It's a weird bug with cgo gcc linking.

import (
"context"
"strings"
Expand Down
1 change: 0 additions & 1 deletion internal/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package state

import "C"
import (
"slices"
"sync"
Expand Down
3 changes: 0 additions & 3 deletions scaling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package frankenphp

//#include "frankenphp.h"
//#include <sys/resource.h>
import "C"
import (
"errors"
"log/slog"
Expand Down
2 changes: 0 additions & 2 deletions worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package frankenphp

// #include "frankenphp.h"
import "C"
import (
"fmt"
"os"
Expand Down
Loading