diff --git a/src/gausskernel/process/postmaster/aiocompleter.cpp b/src/gausskernel/process/postmaster/aiocompleter.cpp
index aa0d16ca2..c58da3da2 100644
--- a/src/gausskernel/process/postmaster/aiocompleter.cpp
+++ b/src/gausskernel/process/postmaster/aiocompleter.cpp
@@ -612,7 +612,7 @@ static void CompltrConfig(SIGNAL_ARGS)
  */
 static void CompltrQuickDie(SIGNAL_ARGS)
 {
-    PG_SETMASK(&t_thrd.libpq_cxt.BlockSig);
+    gs_signal_setmask(&t_thrd.libpq_cxt.BlockSig, NULL);
 
     /*
      * We DO NOT want to run proc_exit() callbacks -- we're here because
diff --git a/src/gausskernel/process/postmaster/postmaster.cpp b/src/gausskernel/process/postmaster/postmaster.cpp
index 7cb582977..618b342ee 100644
--- a/src/gausskernel/process/postmaster/postmaster.cpp
+++ b/src/gausskernel/process/postmaster/postmaster.cpp
@@ -5662,7 +5662,7 @@ static void SIGHUP_handler(SIGNAL_ARGS)
          */
         if (get_file_lock(gucconf_lock_file, &filelock) != CODE_OK) {
             ereport(WARNING, (errmsg("the last sigup signal is processing,get file lock failed.")));
-            (void)PG_SETMASK(&t_thrd.libpq_cxt.UnBlockSig);
+            gs_signal_setmask(&t_thrd.libpq_cxt.UnBlockSig, NULL);
             errno = save_errno;
             return;
         }
@@ -5677,7 +5677,7 @@ static void SIGHUP_handler(SIGNAL_ARGS)
         }
         if (!get_locked) {
             ereport(WARNING, (errmsg("the last sigup signal is processing,get file thread lock failed.")));
-            (void)PG_SETMASK(&t_thrd.libpq_cxt.UnBlockSig);
+            gs_signal_setmask(&t_thrd.libpq_cxt.UnBlockSig, NULL);
             errno = save_errno;
             return;
         }